qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Conditionalize unnecessary #include.

This commit is contained in:
Roland McGrath 2011-10-08 15:28:21 -07:00
parent c658d255e9
commit 5060422095
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2011-10-08 Roland McGrath <roland@hack.frob.com> 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. * nscd/nscd_proto.h: Declare __nscd_setnetgrent.
* nss/getent.c (netgroup_keys): Remove unused variable. * nss/getent.c (netgroup_keys): Remove unused variable.

9
sysdeps/unix/sysv/linux/x86_64/time.c
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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 Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
#ifdef SHARED
#include <dl-vdso.h> #include <dl-vdso.h>
#define VSYSCALL_ADDR_vtime 0xffffffffff600400 #define VSYSCALL_ADDR_vtime 0xffffffffff600400
#ifdef SHARED
void *time_ifunc (void) __asm__ ("time"); void *time_ifunc (void) __asm__ ("time");
void * void *
@ -34,7 +32,9 @@ time_ifunc (void)
return _dl_vdso_vsym ("time", &linux26) ?: (void *) VSYSCALL_ADDR_vtime; return _dl_vdso_vsym ("time", &linux26) ?: (void *) VSYSCALL_ADDR_vtime;
} }
__asm (".type time, %gnu_indirect_function"); __asm (".type time, %gnu_indirect_function");
#else #else
# include <time.h> # include <time.h>
# include <sysdep.h> # include <sysdep.h>
@ -44,6 +44,7 @@ time (time_t *t)
INTERNAL_SYSCALL_DECL (err); INTERNAL_SYSCALL_DECL (err);
return INTERNAL_SYSCALL (time, err, 1, t); return INTERNAL_SYSCALL (time, err, 1, t);
} }
#endif #endif
strong_alias (time, __GI_time) strong_alias (time, __GI_time)