* Fixed the BeOS compile typo.

[vlc] / include / common.h

diff --git a/include/common.h b/include/common.h
index 3004ec791a63e272973d6a55814b43fb10e50b4e..423eeb9e6e91849c55206378530e09a74dec1fa5 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -3,7 +3,7 @@
  * 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 $
+ * $Id: common.h,v 1.32 2001/05/30 17:03:11 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -39,6 +39,8 @@ typedef u8                  byte_t;
 /* Boolean type */
 #ifdef BOOLEAN_T_IN_SYS_TYPES_H
 #   include <sys/types.h>
+#elif defined(BOOLEAN_T_IN_PTHREAD_H)
+#   include <pthread.h>
 #else
 typedef int                 boolean_t;
 #endif
@@ -61,6 +63,13 @@ typedef int                 ptrdiff_t;
 /* Counter for statistics and profiling */
 typedef unsigned long       count_t;
 
+/* DCT elements types */
+#ifndef VDEC_DFT
+typedef short dctelem_t;
+#else
+typedef int dctelem_t;
+#endif
+
 /*****************************************************************************
  * Classes declaration
  *****************************************************************************/
@@ -72,10 +81,12 @@ struct plugin_info_s;
 typedef struct plugin_bank_s *          p_plugin_bank_t;
 typedef struct plugin_info_s *          p_plugin_info_t;
 
-/* Playlist */
+/* Plugins */
 struct playlist_s;
+struct playlist_item_s;
 
 typedef struct playlist_s *             p_playlist_t;
+typedef struct playlist_item_s *        p_playlist_item_t;
 
 /* Interface */
 struct intf_thread_s;
@@ -92,11 +103,11 @@ typedef struct intf_channel_s *         p_intf_channel_t;
 
 /* Input */
 struct input_thread_s;
-struct input_vlan_s;
+struct input_channel_s;
 struct input_cfg_s;
 
 typedef struct input_thread_s *         p_input_thread_t;
-typedef struct input_vlan_s *           p_input_vlan_t;
+typedef struct input_channel_s *        p_input_channel_t;
 typedef struct input_cfg_s *            p_input_cfg_t;
 
 /* Audio */
@@ -121,12 +132,18 @@ typedef struct vdec_thread_s *          p_vdec_thread_t;
 typedef struct vpar_thread_s *          p_vpar_thread_t;
 typedef struct video_parser_s *         p_video_parser_t;
 
+/* Misc */
+struct macroblock_s;
+struct data_packet_s;
+struct es_descriptor_s;
+
 /*****************************************************************************
  * Macros and inline functions
  *****************************************************************************/
 
 #ifdef NTOHL_IN_SYS_PARAM_H
 #   include <sys/param.h>
+#elif defined(WIN32)
 #else
 #   include <netinet/in.h>
 #endif
@@ -150,26 +167,26 @@ typedef struct video_parser_s *         p_video_parser_t;
  * 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'
  * needs <netinet/in.h> or the local equivalent. */
-/* FIXME??: hton64 should be declared as an extern inline function to avoid border
- * effects (see byteorder.h) */
-#if __BYTE_ORDER == __LITTLE_ENDIAN
+/* FIXME: hton64 should be declared as an extern inline function to avoid
+ * border effects (see byteorder.h) */
+#if WORDS_BIGENDIAN
 #define hton16      htons
 #define hton32      htonl
-#define hton64(i)   ( ((u64)(htonl((i) & 0xffffffff)) << 32) | htonl(((i) >> 32) & 0xffffffff ) )
+#define hton64(i)   ( i )
 #define ntoh16      ntohs
 #define ntoh32      ntohl
-#define ntoh64      hton64
-#elif __BYTE_ORDER == __BIG_ENDIAN
+#define ntoh64(i)   ( i )
+#else
 #define hton16      htons
 #define hton32      htonl
-#define hton64(i)   ( i )
+#define hton64(i)   ( ((u64)(htonl((i) & 0xffffffff)) << 32) | htonl(((i) >> 32) & 0xffffffff ) )
 #define ntoh16      ntohs
 #define ntoh32      ntohl
-#define ntoh64(i)   ( i )
-#else
-/* XXX??: cause a compilation error */
+#define ntoh64      hton64
 #endif
 
 /* Macros with automatic casts */
-#define U32_AT(p)   ( ntohl ( *( (u32 *)(p) ) ) )
-#define U16_AT(p)   ( ntohs ( *( (u16 *)(p) ) ) )
+#define U64_AT(p)   ( ntoh64 ( *( (u64 *)(p) ) ) )
+#define U32_AT(p)   ( ntoh32 ( *( (u32 *)(p) ) ) )
+#define U16_AT(p)   ( ntoh16 ( *( (u16 *)(p) ) ) )
+