diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-07-31 15:30:38 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-07-31 15:30:38 +0000 |
commit | dd3105b347f432016fcdc1abd472c3717f557c9e (patch) | |
tree | cbaaecdaa1d3ad240177c9040f7f46c1387716ce /libc/nscd | |
parent | 20f73aac36c2b2c240dcc379d5117488fe44960c (diff) |
Merge changes between r19464 and r19920 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@19921 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nscd')
-rw-r--r-- | libc/nscd/gai.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libc/nscd/gai.c b/libc/nscd/gai.c index 2df7ea748..1c6527cf0 100644 --- a/libc/nscd/gai.c +++ b/libc/nscd/gai.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2004-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2004. @@ -43,7 +43,3 @@ /* Some variables normally defined in libc. */ service_user *__nss_hosts_database; - -#if defined NEED_NETLINK && __ASSUME_NETLINK_SUPPORT == 0 -int __no_netlink_support attribute_hidden; -#endif |