summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-12-20 15:11:40 +0000
committerUlrich Drepper <drepper@redhat.com>2005-12-20 15:11:40 +0000
commit35259015841308f7db2bc05a5664fcaab506e6ff (patch)
tree3bf681ab7cef71a9fed692a11d3493328a2f5c99
parent0f7920cf33ac23730debb71c2e734f20407f46ee (diff)
* sysdeps/ia64/fpu/libm-test-ulps: Update for GCC 4.1 prerelease.
* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation.
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/unix/sysv/linux/time.c10
2 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c0328b4ae3..b5a7619b2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-20 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/ia64/fpu/libm-test-ulps: Update for GCC 4.1 prerelease.
+
+ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
+ use sysdeps/unix/time.c implementation.
+
2005-12-19 Ulrich Drepper <drepper@redhat.com>
[BZ #1955]
diff --git a/sysdeps/unix/sysv/linux/time.c b/sysdeps/unix/sysv/linux/time.c
index 1698c91d7d..83667906dd 100644
--- a/sysdeps/unix/sysv/linux/time.c
+++ b/sysdeps/unix/sysv/linux/time.c
@@ -21,9 +21,11 @@
#include <sysdep.h>
+#ifdef __NR_time
time_t
-time (time_t *t)
+time (t)
+ time_t *t;
{
INTERNAL_SYSCALL_DECL (err);
time_t res = INTERNAL_SYSCALL (time, err, 1, NULL);
@@ -33,3 +35,9 @@ time (time_t *t)
return res;
}
libc_hidden_def (time)
+
+#else
+
+# include <sysdeps/unix/time.c>
+
+#endif