summaryrefslogtreecommitdiff
path: root/libc/sysdeps
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2004-10-31 20:23:09 +0000
committerManuel Novoa III <mjn3@codepoet.org>2004-10-31 20:23:09 +0000
commitf8f7b102217864ea382a46bb9ad173b3493e5cae (patch)
tree83245aace8d942501f4942a0d15f17edce4b3c6c /libc/sysdeps
parent379218849650fcb2d69b33bfa462b4d073adb201 (diff)
Revert Peter's __lib_gettimeofday patch. There's the minor issue of
adding cruft to include/sys/time.h. But also, there's no sense in making changes like this until we decide how we're going to approach the hidden symbol transition.
Diffstat (limited to 'libc/sysdeps')
-rw-r--r--libc/sysdeps/linux/common/gettimeofday.c7
-rw-r--r--libc/sysdeps/linux/common/time.c2
-rw-r--r--libc/sysdeps/linux/common/utime.c2
3 files changed, 3 insertions, 8 deletions
diff --git a/libc/sysdeps/linux/common/gettimeofday.c b/libc/sysdeps/linux/common/gettimeofday.c
index d904dfa71..297039243 100644
--- a/libc/sysdeps/linux/common/gettimeofday.c
+++ b/libc/sysdeps/linux/common/gettimeofday.c
@@ -9,9 +9,4 @@
#include "syscalls.h"
#include <sys/time.h>
-
-#ifdef __NR_gettimeofday
-#define __NR___libc_gettimeofday __NR_gettimeofday
-#endif
-_syscall2(int, __libc_gettimeofday, struct timeval *, tv, struct timezone *, tz);
-weak_alias(__libc_gettimeofday, gettimeofday);
+_syscall2(int, gettimeofday, struct timeval *, tv, struct timezone *, tz);
diff --git a/libc/sysdeps/linux/common/time.c b/libc/sysdeps/linux/common/time.c
index bd68cd6e8..ea90dc2e7 100644
--- a/libc/sysdeps/linux/common/time.c
+++ b/libc/sysdeps/linux/common/time.c
@@ -18,7 +18,7 @@ time_t time(time_t * t)
time_t result;
struct timeval tv;
- if (__libc_gettimeofday(&tv, (struct timezone *) NULL)) {
+ if (gettimeofday(&tv, (struct timezone *) NULL)) {
result = (time_t) - 1;
} else {
result = (time_t) tv.tv_sec;
diff --git a/libc/sysdeps/linux/common/utime.c b/libc/sysdeps/linux/common/utime.c
index a7c6e9e68..5cae0e0ea 100644
--- a/libc/sysdeps/linux/common/utime.c
+++ b/libc/sysdeps/linux/common/utime.c
@@ -24,7 +24,7 @@ int utime(const char *file, const struct utimbuf *times)
timevals[0].tv_sec = (long int) times->actime;
timevals[1].tv_sec = (long int) times->modtime;
} else {
- if (__libc_gettimeofday(&timevals[0], NULL) < 0) {
+ if (gettimeofday(&timevals[0], NULL) < 0) {
return -1;
}
timevals[1] = timevals[0];