Fix warnings

[vlc] / src / misc / objects.c

diff --git a/src/misc/objects.c b/src/misc/objects.c
index b1d4aea991db473c0985a5290140ca41595a7291..a7e488042d793df9275b7971a61c6ac0fa5b226c 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * objects.c: vlc_object_t handling
  *****************************************************************************
- * Copyright (C) 2004-2007 the VideoLAN team
+ * Copyright (C) 2004-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
@@ -56,7 +56,6 @@
 #include "vlc_httpd.h"
 #include "vlc_vlm.h"
 #include "input/vlm_internal.h"
-#include "vlc_xml.h"
 #include "vlc_osd.h"
 #include "vlc_meta.h"
 
@@ -105,8 +104,8 @@ static void vlc_object_yield_locked( vlc_object_t *p_this );
 static vlc_mutex_t    structure_lock;
 static vlc_object_internals_t global_internals;
 
-vlc_object_t *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
-                                 int i_type, const char *psz_type )
+void *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
+                         int i_type, const char *psz_type )
 {
     vlc_object_t *p_new;
     vlc_object_internals_t *p_priv;
@@ -266,10 +265,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof(playlist_t);
             psz_type = "playlist";
             break;
-        case VLC_OBJECT_SD:
-            i_size = sizeof(services_discovery_t);
-            psz_type = "services discovery";
-            break;
         case VLC_OBJECT_INPUT:
             i_size = sizeof(input_thread_t);
             psz_type = "input";
@@ -314,10 +309,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof( vlm_t );
             psz_type = "vlm dameon";
             break;
-        case VLC_OBJECT_XML:
-            i_size = sizeof( xml_t );
-            psz_type = "xml";
-            break;
         case VLC_OBJECT_OPENGL:
             i_size = sizeof( vout_thread_t );
             psz_type = "opengl";
@@ -326,10 +317,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof( announce_handler_t );
             psz_type = "announce";
             break;
-        case VLC_OBJECT_META_ENGINE:
-            i_size = sizeof( meta_engine_t );
-            psz_type = "meta engine";
-            break;
         case VLC_OBJECT_OSDMENU:
             i_size = sizeof( osd_menu_t );
             psz_type = "osd menu";