Changeset 26db09c07168b75d8c00adac0450bd8ed3e3e414

Show
Ignore:
Timestamp:
13/08/03 21:38:28 (5 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1060803508 +0000
git-parent:

[36edc5e9257c35a601cea9da0b50cc41dd4991a8]

git-author:
Gildas Bazin <gbazin@videolan.org> 1060803508 +0000
Message:

* include/announce.h, src/stream_output/announce.c, modules/stream_out/standard.c: fixed broken build.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/announce.h

    rb83deb1 r26db09c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002 VideoLAN 
    5  * $Id: announce.h,v 1.8 2003/08/13 14:17:26 zorglub Exp $ 
     5 * $Id: announce.h,v 1.9 2003/08/13 19:38:27 gbazin Exp $ 
    66 * 
    77 * Authors: Cl�nt Stenac <zorglub@via.ecp.fr> 
    …… 
    6868 * Prototypes 
    6969 *****************************************************************************/ 
    70 VLC_EXPORT( sap_session_t *,            sout_SAPNew,        ( sout_instance_t *,char * , char * , int , char *) ); 
    71 VLC_EXPORT( void,            sout_SAPSend,        ( sout_instance_t *,sap_session_t *) ); 
    72 VLC_EXPORT( void,            sout_SAPDelete,      ( sout_instance_t *,sap_session_t * ) ); 
     70VLC_EXPORT( sap_session_t *, sout_SAPNew, ( sout_instance_t *,char * , char * , int , char *) ); 
     71VLC_EXPORT( void, sout_SAPSend, ( sout_instance_t *,sap_session_t *) ); 
     72VLC_EXPORT( void, sout_SAPDelete, ( sout_instance_t *,sap_session_t * ) ); 
    7373 
    74 #ifdef HAVE_SLP_H 
    75 VLC_EXPORT( int,        sout_SLPReg,            (sout_instance_t*,char*,char*) ); 
    76 VLC_EXPORT( int,        sout_SLPDereg,          (sout_instance_t*,char*,char*) ); 
    77 #endif 
     74VLC_EXPORT( int, sout_SLPReg, (sout_instance_t*,char*,char*) ); 
     75VLC_EXPORT( int, sout_SLPDereg, (sout_instance_t*,char*,char*) ); 

  • modules/stream_out/standard.c

    rb83deb1 r26db09c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2001, 2002 VideoLAN 
    5  * $Id: standard.c,v 1.9 2003/08/13 14:17:26 zorglub Exp $ 
     5 * $Id: standard.c,v 1.10 2003/08/13 19:38:28 gbazin Exp $ 
    66 * 
    77 * Authors: Laurent Aimar <fenrir@via.ecp.fr> 
    …… 
    7979     
    8080    sout_cfg_t *p_sap_cfg = sout_cfg_find( p_stream->p_cfg, "sap" ); 
     81#ifdef HAVE_SLP_H 
    8182    sout_cfg_t *p_slp_cfg = sout_cfg_find( p_stream->p_cfg, "slp" ); 
     83#endif 
    8284     
    8385    sout_access_out_t   *p_access; 
    …… 
    133135 
    134136    /* *** Register with slp *** */ 
    135     #ifdef HAVE_SLP_H 
     137#ifdef HAVE_SLP_H 
    136138    if( p_slp_cfg && ( strstr( psz_access, "udp" ) || 
    137139                       strstr( psz_access ,  "rtp" ) ) ) 
    …… 
    157159        } 
    158160    }         
    159     #endif 
     161#endif 
    160162     
    161163    /* XXX beurk */ 
    …… 
    186188        sout_SAPDelete( (sout_instance_t *)p_this , p_sys->p_sap );  
    187189 
    188     #ifdef HAVE_SLP_H 
     190#ifdef HAVE_SLP_H 
    189191    if( p_sys->p_slp ) 
    190192    { 
    …… 
    194196            free( p_sys->p_slp); 
    195197    } 
    196     #endif 
     198#endif 
    197199     
    198200     

  • src/stream_output/announce.c

    rb83deb1 r26db09c  
    468468 
    469469#else /* This function should never be called if this is false */ 
    470     return -1  
     470    return -1; 
    471471#endif 
    472472} 
    …… 
    508508 
    509509#else /* This function should never be called if this is false */ 
    510     return -1  
    511 #endif 
    512 } 
     510    return -1;  
     511#endif 
     512}