[vlc-devel] commit: Remove VLC_OBJECT_HTTPD_HOST ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sat Jun 21 11:48:31 2008 +0300| [a1238857104da694b0f7d521f06015322007570d]

Remove VLC_OBJECT_HTTPD_HOST

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a1238857104da694b0f7d521f06015322007570d
---

 include/vlc_objects.h           |    1 -
 modules/misc/lua/libs/objects.c |    1 -
 src/network/httpd.c             |    2 +-
 3 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index e25eb85..45c5347 100644
--- 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 8bce1ec..141b6b4 100644
--- 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 35fb195..86c7745 100644
--- 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;