diff options
| author | Roland McGrath <roland@hack.frob.com> | 2011-10-08 15:28:21 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2011-10-08 15:28:21 -0700 |
| commit | 506042209575f1da21e5bdd2fd32a4ef4760adea (patch) | |
| tree | 2492e897085f21067926f85ba31f4984df62e671 | |
| parent | c658d255e919d40619cc2a5730d502c7777830cc (diff) | |
| download | glibc-506042209575f1da21e5bdd2fd32a4ef4760adea.tar.gz glibc-506042209575f1da21e5bdd2fd32a4ef4760adea.tar.xz glibc-506042209575f1da21e5bdd2fd32a4ef4760adea.zip | |
Conditionalize unnecessary #include.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/time.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index abb83dda1d..df89ebe4ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-10-08 Roland McGrath <roland@hack.frob.com> + * sysdeps/unix/sysv/linux/x86_64/time.c: Move #include <dl-vdso.h> + inside [SHARED], where it is used. + * nscd/nscd_proto.h: Declare __nscd_setnetgrent. * nss/getent.c (netgroup_keys): Remove unused variable. diff --git a/sysdeps/unix/sysv/linux/x86_64/time.c b/sysdeps/unix/sysv/linux/x86_64/time.c index c1c1a7526f..a613eb0f54 100644 --- a/sysdeps/unix/sysv/linux/x86_64/time.c +++ b/sysdeps/unix/sysv/linux/x86_64/time.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001,02, 2003, 2011 Free Software Foundation, Inc. +/* Copyright (C) 2001,02,2003,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,13 +16,11 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef SHARED #include <dl-vdso.h> - #define VSYSCALL_ADDR_vtime 0xffffffffff600400 - -#ifdef SHARED void *time_ifunc (void) __asm__ ("time"); void * @@ -34,7 +32,9 @@ time_ifunc (void) return _dl_vdso_vsym ("time", &linux26) ?: (void *) VSYSCALL_ADDR_vtime; } __asm (".type time, %gnu_indirect_function"); + #else + # include <time.h> # include <sysdep.h> @@ -44,6 +44,7 @@ time (time_t *t) INTERNAL_SYSCALL_DECL (err); return INTERNAL_SYSCALL (time, err, 1, t); } + #endif strong_alias (time, __GI_time) |