summaryrefslogtreecommitdiffstats
path: root/linux
diff options
context:
space:
mode:
authorarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-03-13 00:13:18 +0000
committerarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-03-13 00:13:18 +0000
commitdc17b69e6d93e9d63727eb9f52294dd2c0fcba1f (patch)
treebbfe3c558756a479ca3cd09d029e61beda6f4949 /linux
parentb6b169b6f24af13513f1e0d81c0766d0f7b398ee (diff)
downloadmpv-dc17b69e6d93e9d63727eb9f52294dd2c0fcba1f.tar.bz2
mpv-dc17b69e6d93e9d63727eb9f52294dd2c0fcba1f.tar.xz
removed redundancy...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@100 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'linux')
-rw-r--r--linux/timer-lx.c10
-rw-r--r--linux/timer.h2
2 files changed, 2 insertions, 10 deletions
diff --git a/linux/timer-lx.c b/linux/timer-lx.c
index 0460aaa024..fd251e9251 100644
--- a/linux/timer-lx.c
+++ b/linux/timer-lx.c
@@ -3,7 +3,7 @@
#include <unistd.h>
#include <sys/time.h>
-// Returns current time in seconds
+// Returns current time in microseconds
unsigned int GetTimer(){
struct timeval tv;
struct timezone tz;
@@ -13,14 +13,6 @@ unsigned int GetTimer(){
return (tv.tv_sec*1000000+tv.tv_usec);
}
-// Returns current time in microseconds
-int uGetTimer(){
- struct timeval tv;
- struct timezone tz;
- gettimeofday(&tv,&tz);
- return (int)(tv.tv_usec+1000000*tv.tv_sec);
-}
-
static unsigned int RelativeTime=0;
// Returns time spent between now and last call in seconds
diff --git a/linux/timer.h b/linux/timer.h
index 8348a6cf7b..6274f6883b 100644
--- a/linux/timer.h
+++ b/linux/timer.h
@@ -1,6 +1,6 @@
void InitTimer();
-int GetTimer();
+unsigned int GetTimer();
//int uGetTimer();
float GetRelativeTime();