Include vlc_plugin.h as needed

[vlc] / modules / services_discovery / bonjour.c

diff --git a/modules/services_discovery/bonjour.c b/modules/services_discovery/bonjour.c
index 2c896117a1ba1e8ddcab456c63a2a07312634fd2..933ae05bd04588333b30682a3d6c13f728571ce7 100644 (file)
--- a/modules/services_discovery/bonjour.c
+++ b/modules/services_discovery/bonjour.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_arrays.h>
 
@@ -121,6 +122,11 @@ static void resolve_callback(
 {
     services_discovery_t *p_sd = ( services_discovery_t* )userdata;
     services_discovery_sys_t *p_sys = p_sd->p_sys;
+    
+    VLC_UNUSED(interface); VLC_UNUSED(host_name);
+#ifdef HAVE_AVAHI_06
+    VLC_UNUSED(flags);
+#endif
 
 #ifdef HAVE_AVAHI_06
     if( event == AVAHI_RESOLVER_FAILURE )
@@ -216,6 +222,10 @@ static void browse_callback(
 #endif
     void* userdata )
 {
+    VLC_UNUSED(b);
+#ifdef HAVE_AVAHI_06
+    VLC_UNUSED(flags);
+#endif
     services_discovery_t *p_sd = ( services_discovery_t* )userdata;
     services_discovery_sys_t *p_sys = p_sd->p_sys;
     if( event == AVAHI_BROWSER_NEW )
@@ -261,11 +271,9 @@ static int Open( vlc_object_t *p_this )
 
     p_sd->p_sys = p_sys = (services_discovery_sys_t *)malloc(
         sizeof( services_discovery_sys_t ) );
-    if( p_sd->p_sys == NULL )
-    {
-        msg_Err( p_sd, "out of memory" );
-        return VLC_EGENERIC;
-    }
+
+    if( !p_sys )
+        return VLC_ENOMEM;
 
     memset( p_sys, 0, sizeof(*p_sys) );