Zip: add a stream_filter and an access

[vlc] / include / vlc_common.h

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 27d594d4655f5ea7a52f5bb8a97634db424e54ad..a231d8343602e79eec4f0cbaf67b8a8cc206999b 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -179,7 +179,6 @@ typedef struct config_category_t config_category_t;
 /* Interface */
 typedef struct intf_thread_t intf_thread_t;
 typedef struct intf_sys_t intf_sys_t;
-typedef struct intf_console_t intf_console_t;
 typedef struct intf_msg_t intf_msg_t;
 typedef struct interaction_t interaction_t;
 typedef struct interaction_dialog_t interaction_dialog_t;
@@ -510,7 +509,6 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
  * these members are common for all vlc objects                             \
  */                                                                         \
 /**@{*/                                                                     \
-    int   i_object_type;                                                    \
     const char *psz_object_type;                                            \
     char *psz_object_name;                                                  \
                                                                             \
@@ -603,14 +601,7 @@ static inline uint8_t clip_uint8_vlc( int32_t a )
     else           return a;
 }
 
-/* Malloc with automatic error */
-#define MALLOC_VOID( var, type ) do { var = (type*)malloc( sizeof( type) ); \
-                                   if( !var ) return; } while(0)
-#define MALLOC_NULL( var, type ) do { var = (type*)malloc( sizeof( type) ); \
-                                   if( !var ) return NULL; } while(0)
-#define MALLOC_ERR( var, type ) do { var = (type*)malloc( sizeof( type) ); \
-                                   if( !var ) return VLC_ENOMEM; } while(0)
-
+/* Free and set set the variable to NULL */
 #define FREENULL(a) do { free( a ); a = NULL; } while(0)
 
 #define EMPTY_STR(str) (!str || !*str)
@@ -747,7 +738,6 @@ VLC_EXPORT( size_t, vlc_strlcpy, ( char *, const char *, size_t ) );
 VLC_EXPORT( long long, vlc_strtoll, ( const char *nptr, char **endptr, int base ) LIBVLC_USED );
 
 VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) LIBVLC_USED );
-char *vlc_strsep( char **, const char * );
 
 #if defined(WIN32) || defined(UNDER_CE)
 /* win32, cl and icl support */