Changeset ca434330843238240297944934593dcf6d9b5f3a

Show
Ignore:
Timestamp:
12/22/07 14:44:00 (9 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1198331040 +0000
git-parent:

[3d979f8e505c0d1dc5c51029ed71ab8c46046206]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1198331040 +0000
Message:

services_discovery/sap.c: s/min/min_int/ to prevent a macro collision on windows environment.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/services_discovery/sap.c

    rae4f748 rca43433  
    278278    static void FreeSDP( sdp_t *p_sdp ); 
    279279 
    280 static inline int min( int a, int b ) 
     280static inline int min_int( int a, int b ) 
    281281{ 
    282282    return a > b ? b : a; 
    …… 
    609609                /* Compute next timeout */ 
    610610                if( p_announce->i_period_trust > 5 ) 
    611                     timeout = min((3 * p_announce->i_period - i_last_period) / 1000, timeout); 
    612                 timeout = min((i_timeout - i_last_period)/1000, timeout); 
     611                    timeout = min_int((3 * p_announce->i_period - i_last_period) / 1000, timeout); 
     612                timeout = min_int((i_timeout - i_last_period)/1000, timeout); 
    613613            } 
    614614        }