summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux/common
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-10-19 20:10:18 +0000
committerEric Andersen <andersen@codepoet.org>2004-10-19 20:10:18 +0000
commit7e2b221be1bae211b580ea1204dc7c54b2684abd (patch)
treeeda4e5658779c094fde56643d4f57464f092b945 /libc/sysdeps/linux/common
parentb4f49294526ceadbc4194ec7efb9af04f1e6e577 (diff)
Peter S. Mazinger writes:
Hello! Would the attached patch be acceptable (maybe instead of __libc_gettimeofday using __gettimeofday) We have some issues, see http://bugs.gentoo.org/show_bug.cgi?id=65892
Diffstat (limited to 'libc/sysdeps/linux/common')
-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, 8 insertions, 3 deletions
diff --git a/libc/sysdeps/linux/common/gettimeofday.c b/libc/sysdeps/linux/common/gettimeofday.c
index 297039243..d904dfa71 100644
--- a/libc/sysdeps/linux/common/gettimeofday.c
+++ b/libc/sysdeps/linux/common/gettimeofday.c
@@ -9,4 +9,9 @@
#include "syscalls.h"
#include <sys/time.h>
-_syscall2(int, gettimeofday, struct timeval *, tv, struct timezone *, tz);
+
+#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);
diff --git a/libc/sysdeps/linux/common/time.c b/libc/sysdeps/linux/common/time.c
index ea90dc2e7..bd68cd6e8 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 (gettimeofday(&tv, (struct timezone *) NULL)) {
+ if (__libc_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 5cae0e0ea..a7c6e9e68 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 (gettimeofday(&timevals[0], NULL) < 0) {
+ if (__libc_gettimeofday(&timevals[0], NULL) < 0) {
return -1;
}
timevals[1] = timevals[0];