GLX: remove MIT-SHM support infrastructure

[vlc] / src / misc / objects.c

diff --git a/src/misc/objects.c b/src/misc/objects.c
index eb8e799b5536068e0a3568b345d02c371a8544fc..3d5a13ed34a2cd2adcf9e1f1124ef6a8bc27d736 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -81,9 +81,6 @@ static void           ListChildren  ( vlc_list_t *, vlc_object_t *, int );
 
 static void vlc_object_destroy( vlc_object_t *p_this );
 static void vlc_object_detach_unlocked (vlc_object_t *p_this);
-#ifndef NDEBUG
-static void vlc_object_dump( vlc_object_t *p_this );
-#endif
 
 /*****************************************************************************
  * Local structure lock
@@ -394,7 +391,7 @@ int vlc_object_waitpipe( vlc_object_t *obj )
         /* This can only ever happen if someone killed us without locking: */
         assert (internals->pipes[1] == -1);
 
-#ifdef HAVE_EVENTFD
+#if defined (HAVE_SYS_EVENTFD_H)
         internals->pipes[0] = internals->pipes[1] = eventfd (0, 0);
         if (internals->pipes[0] == -1)
 #endif
@@ -600,7 +597,8 @@ void __vlc_object_release( vlc_object_t *p_this )
 
     if( b_should_destroy )
     {
-        if (p_this->p_parent)
+        parent = p_this->p_parent;
+        if (parent)
             /* Detach from parent to protect against FIND_CHILDREN */
             vlc_object_detach_unlocked (p_this);
 
@@ -920,19 +918,6 @@ void vlc_list_release( vlc_list_t *p_list )
     free( p_list );
 }
 
-/*****************************************************************************
- * dump an object. (Debug function)
- *****************************************************************************/
-#ifndef NDEBUG
-static void vlc_object_dump( vlc_object_t *p_this )
-{
-    char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
-    psz_foo[0] = '|';
-
-    DumpStructure( p_this, 0, psz_foo );
-}
-#endif
-
 /* Following functions are local */
 
 static vlc_object_t * FindObject( vlc_object_t *p_this, int i_type, int i_mode )