vlc core: single storage playlist

[vlc] / include / vlc_common.h

diff --git a/include/vlc_common.h b/include/vlc_common.h
index b2b3b4af2ba1cc4711a2ba6ece1a8a54976aefd3..a45bd973d34c9bebf47dfe09283e0f66678a8e0a 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -74,7 +74,7 @@
 
 /* Format string sanity checks */
 #ifdef __GNUC__
-#   if defined( _WIN32 ) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 4
+#   if defined( _WIN32 ) && (__GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) )
 #     define LIBVLC_FORMAT(x,y) __attribute__ ((format(gnu_printf,x,y)))
 #   else
 #     define LIBVLC_FORMAT(x,y) __attribute__ ((format(printf,x,y)))
@@ -212,6 +212,7 @@ typedef struct config_category_t config_category_t;
 typedef struct input_thread_t input_thread_t;
 typedef struct input_thread_sys_t input_thread_sys_t;
 typedef struct input_item_t input_item_t;
+typedef struct input_item_node_t input_item_node_t;
 typedef struct access_t access_t;
 typedef struct access_sys_t access_sys_t;
 typedef struct stream_t     stream_t;
@@ -536,7 +537,6 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
     int  i_flags;                                                           \
                                                                             \
     /* Object properties */                                                 \
-    volatile bool b_error;                  /**< set by the object */ \
     volatile bool b_die;                   /**< set by the outside */ \
     bool b_force;      /**< set by the outside (eg. module_need()) */ \
                                                                             \
@@ -861,7 +861,6 @@ static inline void *xrealloc (void *ptr, size_t len)
 VLC_EXPORT( const char *, VLC_Version, ( void ) LIBVLC_USED );
 VLC_EXPORT( const char *, VLC_CompileBy, ( void ) LIBVLC_USED );
 VLC_EXPORT( const char *, VLC_CompileHost, ( void ) LIBVLC_USED );
-VLC_EXPORT( const char *, VLC_CompileDomain, ( void ) LIBVLC_USED );
 VLC_EXPORT( const char *, VLC_Compiler, ( void ) LIBVLC_USED );
 
 /*****************************************************************************