From: Rémi Denis-Courmont Date: Sun, 31 May 2009 19:32:09 +0000 (+0300) Subject: Merge branch 'master' of git@git.videolan.org:vlc X-Git-Tag: 1.1.0-ff~5665 X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=commitdiff_plain;h=3eeab0d3a064349bbd0f65b9a890a3cfc82f6283;hp=7079b91c24f7c8032025576407f1386350cae58f Merge branch 'master' of git@git.videolan.org:vlc --- diff --git a/include/vlc_mtime.h b/include/vlc_mtime.h index 0a75dacdf9..8c86e2f5c8 100644 --- a/include/vlc_mtime.h +++ b/include/vlc_mtime.h @@ -68,7 +68,7 @@ VLC_EXPORT( void, mwait, ( mtime_t date ) ); VLC_EXPORT( void, msleep, ( mtime_t delay ) ); VLC_EXPORT( char *, secstotimestr, ( char *psz_buffer, int secs ) ); -#if defined (__GNUC__) && defined (__linux__) +#if defined (__GNUC__) && (__GNUC__ >= 4) && defined (__linux__) # define VLC_HARD_MIN_SLEEP 1000 /* Linux has 100, 250, 300 or 1000Hz */ # define VLC_SOFT_MIN_SLEEP 9000000