about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-09-06 17:21:04 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-06 17:21:04 -0400
commit42a36f6670797912fa4c2b0e0cb3792e88c1a3bc (patch)
tree4cd5901bd00429257e9c481c43435f8b9abe81d5
parent8e1294e83f2b3af81073f5003071a24f7ad0b359 (diff)
parenta8f84144c945f0c5df053661acc269fcff28b6ad (diff)
downloadglibc-42a36f6670797912fa4c2b0e0cb3792e88c1a3bc.tar.gz
glibc-42a36f6670797912fa4c2b0e0cb3792e88c1a3bc.tar.xz
glibc-42a36f6670797912fa4c2b0e0cb3792e88c1a3bc.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/gettimeofday.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0176dcf0f0..fd78d99289 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-06  Andreas Schwab  <schwab@redhat.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/gettimeofday.c [!SHARED]: Include
+	<errno.h>.
+
 2011-09-06  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/unix/sysv/linux/kernel-features.h: Add entry for getcpu
diff --git a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
index 56171bcfca..3aba81ceb1 100644
--- a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
+++ b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
@@ -38,6 +38,7 @@ __asm (".type __gettimeofday, %gnu_indirect_function");
 #else
 # include <sys/time.h>
 # include <sysdep.h>
+# include <errno.h>
 
 int
 __gettimeofday (struct timeval *tv, struct timezone *tz)