. should compile & run on Solaris with ./configure --disable-dsp

[vlc] / include / common.h

diff --git a/include/common.h b/include/common.h
index af734ad62f56cbba30a70836fe3a2b4b3b49674f..3004ec791a63e272973d6a55814b43fb10e50b4e 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -1,9 +1,29 @@
 /*****************************************************************************
  * common.h: common definitions
- * (c)1998 VideoLAN
- *****************************************************************************
- * Collection of usefull common types and macros definitions
+ * Collection of useful common types and macros definitions
  *****************************************************************************
+ * Copyright (C) 1998, 1999, 2000 VideoLAN
+ * $Id: common.h,v 1.21 2001/01/06 07:23:32 sam Exp $
+ *
+ * Authors: Samuel Hocevar <sam@via.ecp.fr>
+ *          Vincent Seguin <seguin@via.ecp.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
  * required headers:
  *  config.h
  *****************************************************************************/
@@ -17,9 +37,25 @@
 typedef u8                  byte_t;
 
 /* Boolean type */
+#ifdef BOOLEAN_T_IN_SYS_TYPES_H
+#   include <sys/types.h>
+#else
 typedef int                 boolean_t;
+#endif
 #ifdef SYS_GNU
-#define _MACH_I386_BOOLEAN_H_
+#   define _MACH_I386_BOOLEAN_H_
+#endif
+
+/* ptrdiff_t definition */
+#ifdef HAVE_STDDEF_H
+#   include <stddef.h>
+#else
+#   include <malloc.h>
+#   ifndef _PTRDIFF_T
+#       define _PTRDIFF_T
+/* Not portable in a 64-bit environment. */
+typedef int                 ptrdiff_t;
+#   endif
 #endif
 
 /* Counter for statistics and profiling */
@@ -29,6 +65,18 @@ typedef unsigned long       count_t;
  * Classes declaration
  *****************************************************************************/
 
+/* Plugins */
+struct plugin_bank_s;
+struct plugin_info_s;
+
+typedef struct plugin_bank_s *          p_plugin_bank_t;
+typedef struct plugin_info_s *          p_plugin_info_t;
+
+/* Playlist */
+struct playlist_s;
+
+typedef struct playlist_s *             p_playlist_t;
+
 /* Interface */
 struct intf_thread_s;
 struct intf_sys_s;
@@ -77,6 +125,12 @@ typedef struct video_parser_s *         p_video_parser_t;
  * Macros and inline functions
  *****************************************************************************/
 
+#ifdef NTOHL_IN_SYS_PARAM_H
+#   include <sys/param.h>
+#else
+#   include <netinet/in.h>
+#endif
+
 /* CEIL: division with round to nearest greater integer */
 #define CEIL(n, d)  ( ((n) / (d)) + ( ((n) % (d)) ? 1 : 0) )
 
@@ -84,10 +138,14 @@ typedef struct video_parser_s *         p_video_parser_t;
 #define PAD(n, d)   ( ((n) % (d)) ? ((((n) / (d)) + 1) * (d)) : (n) )
 
 /* MAX and MIN: self explanatory */
+#ifndef MAX
 #define MAX(a, b)   ( ((a) > (b)) ? (a) : (b) )
+#endif
+#ifndef MIN
 #define MIN(a, b)   ( ((a) < (b)) ? (a) : (b) )
+#endif
 
-/* MSB (big endian)/LSB (little endian) convertions - network order is always
+/* MSB (big endian)/LSB (little endian) conversions - network order is always
  * MSB, and should be used for both network communications and files. Note that
  * byte orders other than little and big endians are not supported, but only
  * the VAX seems to have such exotic properties - note that these 'functions'
@@ -112,6 +170,6 @@ typedef struct video_parser_s *         p_video_parser_t;
 /* XXX??: cause a compilation error */
 #endif
 
-/* Macros used by input to access the TS buffer */
+/* Macros with automatic casts */
 #define U32_AT(p)   ( ntohl ( *( (u32 *)(p) ) ) )
 #define U16_AT(p)   ( ntohs ( *( (u16 *)(p) ) ) )