Win32: always use mingw's snprintf

[vlc] / include / vlc_mtime.h

diff --git a/include/vlc_mtime.h b/include/vlc_mtime.h
index d8cfca94db08e9f2effb0cb9926bce4c121366b2..0e623c2074de95daf30c59dee8b1970797d5610d 100644 (file)
--- a/include/vlc_mtime.h
+++ b/include/vlc_mtime.h
@@ -29,6 +29,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifndef __VLC_MTIME_H
+# define __VLC_MTIME_H 1
+
 /*****************************************************************************
  * LAST_MDATE: date which will never happen
  *****************************************************************************
@@ -48,22 +51,11 @@
  *****************************************************************************/
 #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 char * secstotimestr( char *psz_buffer, int32_t secs );
 
 /*****************************************************************************
  * date_t: date incrementation without long-term rounding errors
@@ -76,10 +68,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( 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_ */