win32 installer: fix some registry entries for win32

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index a5082745a8b656b797a030d75484a002e019685d..f1d72ec95524070d8cca875e9d875822323b5515 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -32,8 +32,6 @@
  */
 
 /* Object types */
-#define VLC_OBJECT_LIBVLC      (-2)
-#define VLC_OBJECT_MODULE      (-3)
 #define VLC_OBJECT_INTF        (-4)
 #define VLC_OBJECT_PLAYLIST    (-5)
 #define VLC_OBJECT_INPUT       (-7)
@@ -42,7 +40,6 @@
 #define VLC_OBJECT_AOUT        (-10)
 #define VLC_OBJECT_PACKETIZER  (-13)
 #define VLC_OBJECT_ENCODER     (-14)
-#define VLC_OBJECT_OPENGL      (-21)
 #define VLC_OBJECT_OSDMENU     (-28)
 /* Please add new object types below -34 */
 /* Please do not add new object types anyway */
@@ -111,7 +108,7 @@ VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
     vlc_object_find_name( VLC_OBJECT(a),b,c)
 
 #define vlc_object_hold(a) \
-    (typeof(a))__vlc_object_hold( VLC_OBJECT(a) )
+    __vlc_object_hold( VLC_OBJECT(a) )
 
 #define vlc_object_release(a) \
     __vlc_object_release( VLC_OBJECT(a) )
@@ -160,7 +157,3 @@ static inline bool __vlc_object_alive (const vlc_object_t *obj)
 
 #define vlc_object_alive(a) \
     __vlc_object_alive( VLC_OBJECT(a) )
-
-VLC_EXPORT( int, __vlc_object_waitpipe, ( vlc_object_t *obj ));
-#define vlc_object_waitpipe(a) \
-    __vlc_object_waitpipe( VLC_OBJECT(a) )