diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
| commit | 1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07 (patch) | |
| tree | c5e99bfe0e69cd37fb8ac70fadf00ce54a1cbe3c /osdep/timer-linux.c | |
| parent | f2864e9a072f53c38a04dd7c44392521777dc908 (diff) | |
| parent | 86c9fb2e8930de031807513c9b93d47394d2d2fa (diff) | |
| download | mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.bz2 mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.xz | |
Merge svn changes up to r29277
Diffstat (limited to 'osdep/timer-linux.c')
| -rw-r--r-- | osdep/timer-linux.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c index 576bae5be6..defb69ff7b 100644 --- a/osdep/timer-linux.c +++ b/osdep/timer-linux.c @@ -31,9 +31,9 @@ const char timer_name[] = #ifdef HAVE_NANOSLEEP - "nanosleep()"; + "nanosleep()"; #else - "usleep()"; + "usleep()"; #endif int usec_sleep(int usec_delay) @@ -49,19 +49,22 @@ int usec_sleep(int usec_delay) } // Returns current time in microseconds -unsigned int GetTimer(void){ +unsigned int GetTimer(void) +{ struct timeval tv; gettimeofday(&tv,NULL); return tv.tv_sec * 1000000 + tv.tv_usec; } // Returns current time in milliseconds -unsigned int GetTimerMS(void){ +unsigned int GetTimerMS(void) +{ struct timeval tv; gettimeofday(&tv,NULL); return tv.tv_sec * 1000 + tv.tv_usec / 1000; } // Initialize timer, must be called at least once at start -void InitTimer(void){ +void InitTimer(void) +{ } |