Hide httpd_t and httpd_host_t within httpd.c

[vlc] / src / misc / objects.c

diff --git a/src/misc/objects.c b/src/misc/objects.c
index e28776a1cf2d5045051c2bacb4b42e80be98d75f..73b599af1eaf8379da42790613053c2cb6c246fb 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -36,6 +36,7 @@
 #   include <stdlib.h>                                          /* realloc() */
 #endif
 
+#include "../libvlc.h"
 #include <vlc_vout.h>
 #include <vlc_aout.h>
 #include "audio_output/aout_internal.h"
@@ -53,7 +54,6 @@
 #include "vlc_filter.h"
 
 #include "vlc_httpd.h"
-#include "../network/httpd.h"
 #include "vlc_vlm.h"
 #include "vlc_vod.h"
 #include "vlc_tls.h"
@@ -87,7 +87,7 @@ static void           ListChildren  ( vlc_list_t *, vlc_object_t *, int );
  *****************************************************************************/
 static vlc_mutex_t    structure_lock;
 
-static vlc_object_t *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
+vlc_object_t *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
                                  int i_type, const char *psz_type )
 {
     vlc_object_t * p_new;
@@ -204,7 +204,6 @@ static vlc_object_t *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
  */
 void * __vlc_object_create( vlc_object_t *p_this, int i_type )
 {
-    vlc_object_t * p_new;
     const char   * psz_type;
     size_t         i_size;
 
@@ -286,14 +285,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof(sout_instance_t);
             psz_type = "stream output";
             break;
-        case VLC_OBJECT_HTTPD:
-            i_size = sizeof( httpd_t );
-            psz_type = "http server";
-            break;
-        case VLC_OBJECT_HTTPD_HOST:
-            i_size = sizeof( httpd_host_t );
-            psz_type = "http server";
-            break;
         case VLC_OBJECT_VLM:
             i_size = sizeof( vlm_t );
             psz_type = "vlm dameon";