Remove VLC_OBJECT_HTTPD_HOST

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index e25eb85006528aaad5e9b18cdb24ec0e8b15e014..45c5347d4ffbfdc136ef2ab18dc84ff9b24a87a9 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -47,7 +47,6 @@
 #define VLC_OBJECT_OPENGL      (-21)
 #define VLC_OBJECT_FILTER      (-22)
 #define VLC_OBJECT_OSDMENU     (-28)
-#define VLC_OBJECT_HTTPD_HOST  (-30)
 #define VLC_OBJECT_INTERACTION (-32)
 /* Please add new object types below -34 */
 /* Please do not add new object types anyway */

diff --git a/modules/misc/lua/libs/objects.c b/modules/misc/lua/libs/objects.c
index 8bce1ecd6614b0b14b183ba7a80b1929e0ae38d7..141b6b44d9c546072518ba351aff04da23f5b5f8 100644 (file)
--- a/modules/misc/lua/libs/objects.c
+++ b/modules/misc/lua/libs/objects.c
@@ -103,7 +103,6 @@ static int vlc_object_type_from_string( const char *psz_name )
           { VLC_OBJECT_OPENGL, "opengl" },
           { VLC_OBJECT_FILTER, "filter" },
           { VLC_OBJECT_OSDMENU, "osdmenu" },
-          { VLC_OBJECT_HTTPD_HOST, "httpd_host" },
           { VLC_OBJECT_INTERACTION, "interaction" },
           { VLC_OBJECT_GENERIC, "generic" },
           { 0, "" } };

diff --git a/src/network/httpd.c b/src/network/httpd.c
index 35fb1959e18a8389295b8073378d722a2a277ec1..86c7745209ac3208eba141dc6028faa489597cae 100644 (file)
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -1066,7 +1066,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
 
     /* create the new host */
     host = (httpd_host_t *)vlc_custom_create( p_this, sizeof (*host),
-                                              VLC_OBJECT_HTTPD_HOST,
+                                              VLC_OBJECT_GENERIC,
                                               psz_object_type );
     if (host == NULL)
         goto error;