]> git.sesse.net Git - vlc/blobdiff - include/common.h
* Fixed the BeOS compile typo.
[vlc] / include / common.h
index b7bfe86fc58c34909946b259d4ac6a76b14b4a3a..423eeb9e6e91849c55206378530e09a74dec1fa5 100644 (file)
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.27 2001/02/08 04:43:27 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
@@ -79,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;
@@ -99,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 */
@@ -131,6 +135,7 @@ 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
@@ -138,6 +143,7 @@ struct data_packet_s;
 
 #ifdef NTOHL_IN_SYS_PARAM_H
 #   include <sys/param.h>
+#elif defined(WIN32)
 #else
 #   include <netinet/in.h>
 #endif