* include/announce.h, src/stream_output/announce.c, modules/stream_out/standard.c...

diff --git a/include/announce.h b/include/announce.h
index 98c9c533310093921c5970c07dfcd3682c33e20f..0856d0c79f2f2ae57f1f6b36d9a6614bc4dbc400 100644 (file)
--- a/include/announce.h
+++ b/include/announce.h
@@ -2,7 +2,7 @@
  * announce.h : Session announcement
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: announce.h,v 1.8 2003/08/13 14:17:26 zorglub Exp $
+ * $Id: announce.h,v 1.9 2003/08/13 19:38:27 gbazin Exp $
  *
  * Authors: Clément Stenac <zorglub@via.ecp.fr>
  *
@@ -67,11 +67,9 @@ struct slp_session_t
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-VLC_EXPORT( sap_session_t *,            sout_SAPNew,         ( sout_instance_t *,char * , char * , int , char *) );
-VLC_EXPORT( void,            sout_SAPSend,        ( sout_instance_t *,sap_session_t *) );
-VLC_EXPORT( void,            sout_SAPDelete,      ( sout_instance_t *,sap_session_t * ) );
+VLC_EXPORT( sap_session_t *, sout_SAPNew, ( sout_instance_t *,char * , char * , int , char *) );
+VLC_EXPORT( void, sout_SAPSend, ( sout_instance_t *,sap_session_t *) );
+VLC_EXPORT( void, sout_SAPDelete, ( sout_instance_t *,sap_session_t * ) );
 
-#ifdef HAVE_SLP_H
-VLC_EXPORT( int,        sout_SLPReg,            (sout_instance_t*,char*,char*) );
-VLC_EXPORT( int,        sout_SLPDereg,          (sout_instance_t*,char*,char*) );
-#endif
+VLC_EXPORT( int, sout_SLPReg, (sout_instance_t*,char*,char*) );
+VLC_EXPORT( int, sout_SLPDereg, (sout_instance_t*,char*,char*) );

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index c25e3918b39afac93cd9ffea57839fbcf16eff66..722fe32c63016d70bb7e27c57d3fffd6d3c0c962 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -2,7 +2,7 @@
  * standard.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: standard.c,v 1.9 2003/08/13 14:17:26 zorglub Exp $
+ * $Id: standard.c,v 1.10 2003/08/13 19:38:28 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -78,7 +78,9 @@ static int Open( vlc_object_t *p_this )
     char *psz_v6_scope = sout_cfg_find_value( p_stream->p_cfg, "sap_v6scope" );
     
     sout_cfg_t *p_sap_cfg = sout_cfg_find( p_stream->p_cfg, "sap" );
+#ifdef HAVE_SLP_H
     sout_cfg_t *p_slp_cfg = sout_cfg_find( p_stream->p_cfg, "slp" );
+#endif
     
     sout_access_out_t   *p_access;
     sout_mux_t          *p_mux;    
@@ -132,7 +134,7 @@ static int Open( vlc_object_t *p_this )
     }   
 
     /* *** Register with slp *** */
-    #ifdef HAVE_SLP_H
+#ifdef HAVE_SLP_H
     if( p_slp_cfg && ( strstr( psz_access, "udp" ) ||
                        strstr( psz_access ,  "rtp" ) ) )
     {
@@ -156,7 +158,7 @@ static int Open( vlc_object_t *p_this )
                     p_slp_cfg->psz_value ? p_slp_cfg->psz_value : psz_url);
         }
     }        
-    #endif
+#endif
     
     /* XXX beurk */
     p_sout->i_preheader = __MAX( p_sout->i_preheader, p_mux->i_preheader );
@@ -185,7 +187,7 @@ static void Close( vlc_object_t * p_this )
     if( p_sys->p_sap )
         sout_SAPDelete( (sout_instance_t *)p_this , p_sys->p_sap ); 
 
-    #ifdef HAVE_SLP_H
+#ifdef HAVE_SLP_H
     if( p_sys->p_slp )
     {
             sout_SLPDereg( (sout_instance_t *)p_this, 
@@ -193,7 +195,7 @@ static void Close( vlc_object_t * p_this )
                         p_sys->p_slp->psz_name);
             free( p_sys->p_slp);
     }
-    #endif
+#endif
     
     
     sout_MuxDelete( p_sys->p_mux );

diff --git a/src/stream_output/announce.c b/src/stream_output/announce.c
index 306942b8af5c2e4d77879c049b2fb4283e6cd4af..3708e98ede4026e30ba392455227595d48b2222f 100644 (file)
--- a/src/stream_output/announce.c
+++ b/src/stream_output/announce.c
@@ -467,7 +467,7 @@ int sout_SLPReg( sout_instance_t *p_sout, char * psz_url,
     return 0;
 
 #else /* This function should never be called if this is false */
-    return -1 
+    return -1;
 #endif
 }
 
@@ -507,6 +507,6 @@ int sout_SLPDereg( sout_instance_t *p_sout, char * psz_url,
     return 0;
 
 #else /* This function should never be called if this is false */
-    return -1 
+    return -1; 
 #endif
 }