about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-12-15 01:12:13 +0000
committerUlrich Drepper <drepper@redhat.com>2007-12-15 01:12:13 +0000
commit52386be756e113f20502f181d780aecc38cbb66a (patch)
treec3332c9a56057bcb452007582a9c20aac1c7158c
parent78b767a0a66e60212c0517f96f1dcfb0262271dc (diff)
downloadglibc-52386be756e113f20502f181d780aecc38cbb66a.tar.gz
glibc-52386be756e113f20502f181d780aecc38cbb66a.tar.xz
glibc-52386be756e113f20502f181d780aecc38cbb66a.zip
* sysdeps/unix/sysv/linux/x86_64/init-first.c (__vdso_gettimeofday):
	Return long.
	(__vdso_clock_gettime): Likewise.
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/init-first.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dc6d34d5b3..97b45e1fb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
 	* sysdeps/unix/sysv/linux/x86_64/sysdep.h (INTERNAL_SYSCALL_ERROR_P):
 	First cast argument to long
+	* sysdeps/unix/sysv/linux/x86_64/init-first.c (__vdso_gettimeofday):
+	Return long.
+	(__vdso_clock_gettime): Likewise.
 	* sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h: Functions
 	return long.
 
diff --git a/sysdeps/unix/sysv/linux/x86_64/init-first.c b/sysdeps/unix/sysv/linux/x86_64/init-first.c
index e9cf5646b5..ead7dbcc38 100644
--- a/sysdeps/unix/sysv/linux/x86_64/init-first.c
+++ b/sysdeps/unix/sysv/linux/x86_64/init-first.c
@@ -20,9 +20,9 @@
 # include <dl-vdso.h>
 # include <bits/libc-vdso.h>
 
-int (*__vdso_gettimeofday) (struct timeval *, void *) attribute_hidden;
+long int (*__vdso_gettimeofday) (struct timeval *, void *) attribute_hidden;
 
-int (*__vdso_clock_gettime) (clockid_t, struct timespec *)
+long int (*__vdso_clock_gettime) (clockid_t, struct timespec *)
   __attribute__ ((nocommon));
 strong_alias (__vdso_clock_gettime, __GI___vdso_clock_gettime attribute_hidden)