X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_mtime.h;h=46b666a63bfe08ae52d9249e348816cd91e83b29;hb=57333f5920db4a41a2d9a7965bb4d7a1df7e61c2;hp=c8101f4afe7f36e04e963f159d0f34d98cb92d1c;hpb=0d4f6264e4267fdd907fd8216cd511a1f7743625;p=vlc

diff --git a/include/vlc_mtime.h b/include/vlc_mtime.h
index c8101f4afe..46b666a63b 100644
--- a/include/vlc_mtime.h
+++ b/include/vlc_mtime.h
@@ -51,29 +51,23 @@
  *****************************************************************************/
 #define MSTRTIME_MAX_SIZE 22
 
-/* Well, Duh? But it does clue us in that we are converting from
-   millisecond quantity to a second quantity or vice versa.
-*/
-#define MILLISECONDS_PER_SEC 1000
-
-#define msecstotimestr(psz_buffer, msecs) \
-  secstotimestr( psz_buffer, (msecs / (int) MILLISECONDS_PER_SEC) )
-
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-VLC_EXPORT( char *,  mstrtime, ( char *psz_buffer, mtime_t date ) );
-VLC_EXPORT( mtime_t, mdate,    ( void ) );
-VLC_EXPORT( void,    mwait,    ( mtime_t date ) );
-VLC_EXPORT( void,    msleep,   ( mtime_t delay ) );
-VLC_EXPORT( char *,  secstotimestr, ( char *psz_buffer, int secs ) );
+VLC_API char * mstrtime( char *psz_buffer, mtime_t date );
+VLC_API mtime_t mdate( void );
+VLC_API void mwait( mtime_t date );
+VLC_API void msleep( mtime_t delay );
+VLC_API char * secstotimestr( char *psz_buffer, int32_t secs );
 
-#if (defined (__GNUC__) && defined (__linux__)) || defined (__FreeBSD__)
+# define VLC_HARD_MIN_SLEEP 10000   /* 10 milliseconds = 1 tick at 100Hz */
+
+#if defined (__GNUC__) \
+ && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
 /* Linux has 100, 250, 300 or 1000Hz
  *
  * HZ=100 by default on FreeBSD, but some architectures use a 1000Hz timer
  */
-# define VLC_HARD_MIN_SLEEP 10000   /* 10 milliseconds = 1 tick at 100Hz */
 # define VLC_SOFT_MIN_SLEEP 9000000 /* 9 seconds */
 
 static
@@ -134,12 +128,12 @@ struct date_t
     uint32_t i_remainder;
 };
 
-VLC_EXPORT( void,    date_Init,      ( date_t *, uint32_t, uint32_t ) );
-VLC_EXPORT( void,    date_Change,    ( date_t *, uint32_t, uint32_t ) );
-VLC_EXPORT( void,    date_Set,       ( date_t *, mtime_t ) );
-VLC_EXPORT( mtime_t, date_Get,       ( const date_t * ) );
-VLC_EXPORT( void,    date_Move,      ( date_t *, mtime_t ) );
-VLC_EXPORT( mtime_t, date_Increment, ( date_t *, uint32_t ) );
-VLC_EXPORT( mtime_t, date_Decrement, ( date_t *, uint32_t ) );
-VLC_EXPORT( uint64_t, NTPtime64,     ( void ) );
+VLC_API void date_Init( date_t *, uint32_t, uint32_t );
+VLC_API void date_Change( date_t *, uint32_t, uint32_t );
+VLC_API void date_Set( date_t *, mtime_t );
+VLC_API mtime_t date_Get( const date_t * );
+VLC_API void date_Move( date_t *, mtime_t );
+VLC_API mtime_t date_Increment( date_t *, uint32_t );
+VLC_API mtime_t date_Decrement( date_t *, uint32_t );
+VLC_API uint64_t NTPtime64( void );
 #endif /* !__VLC_MTIME_ */