[vlc-devel] commit: Fix compilation (Christophe Mutricy )

[git version control]

vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Fri Aug 29 00:06:53 2008 +0100| [ed23e2fc96daca64cdc4df17935bad2dd6fc4365] | committer: Christophe Mutricy 

Fix compilation

Was missing from [629f5752332506b6988a4bb72add829b27e3c470]

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

 modules/access_output/bonjour.c |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/modules/access_output/bonjour.c b/modules/access_output/bonjour.c
index 507ddf4..6bae0f1 100644
--- a/modules/access_output/bonjour.c
+++ b/modules/access_output/bonjour.c
@@ -36,10 +36,8 @@
 #include <vlc_sout.h>
 
 #include <avahi-client/client.h>
-#ifdef HAVE_AVAHI_06
-# include <avahi-client/publish.h>
-# include <avahi-client/lookup.h>
-#endif
+#include <avahi-client/publish.h>
+#include <avahi-client/lookup.h>
 #include <avahi-common/alternative.h>
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/malloc.h>
@@ -122,11 +120,7 @@ static int create_service( bonjour_t *p_sys )
     }
 
     error = avahi_entry_group_add_service( p_sys->group, AVAHI_IF_UNSPEC,
-#ifdef HAVE_AVAHI_06
                                            AVAHI_PROTO_UNSPEC, 0, p_sys->psz_name,
-#else
-                                           AVAHI_PROTO_UNSPEC, p_sys->psz_name,
-#endif
                                            p_sys->psz_stype, NULL, NULL,
                                            p_sys->i_port,
                                            p_sys->psz_txt, NULL );
@@ -167,12 +161,8 @@ static void client_callback( AvahiClient *c,
         if( p_sys->group != NULL )
             avahi_entry_group_reset( p_sys->group );
     }
-#ifdef HAVE_AVAHI_06
     else if( state == AVAHI_CLIENT_FAILURE &&
               (avahi_client_errno(c) == AVAHI_ERR_DISCONNECTED) )
-#else
-    else if( state == AVAHI_CLIENT_DISCONNECTED )
-#endif
     {
         msg_Err( p_sys->p_log, "avahi client disconnected" );
         avahi_simple_poll_quit( p_sys->simple_poll );
@@ -234,9 +224,7 @@ void *bonjour_start_service( vlc_object_t *p_log, const char *psz_stype,
     }
 
     p_sys->client = avahi_client_new( avahi_simple_poll_get(p_sys->simple_poll),
-#ifdef HAVE_AVAHI_06
                                       0,
-#endif
                                       client_callback, p_sys, &err );
     if( p_sys->client == NULL )
     {