Conditionalize unnecessary #include.

diff --git a/ChangeLog b/ChangeLog
index abb83dda1d1e8ac11897e09510f87a0ee7f1af2a..df89ebe4eeac76b8527f3450509686d0d47507e7 100644 (file)
--- 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 c1c1a7526f25e96e7624932aa8e47ee23e589101..a613eb0f54a737a0b1ed3cfc26143d8aefa801e2 100644 (file)
--- 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)