Commit 3eeab0d3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Merge branch 'master' of git@git.videolan.org:vlc

parents 7079b91c 4b44912c
...@@ -68,7 +68,7 @@ VLC_EXPORT( void, mwait, ( mtime_t date ) ); ...@@ -68,7 +68,7 @@ VLC_EXPORT( void, mwait, ( mtime_t date ) );
VLC_EXPORT( void, msleep, ( mtime_t delay ) ); VLC_EXPORT( void, msleep, ( mtime_t delay ) );
VLC_EXPORT( char *, secstotimestr, ( char *psz_buffer, int secs ) ); 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_HARD_MIN_SLEEP 1000 /* Linux has 100, 250, 300 or 1000Hz */
# define VLC_SOFT_MIN_SLEEP 9000000 # define VLC_SOFT_MIN_SLEEP 9000000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment