Merge branch 'master' into bug13658-branch

[platform/upstream/glibc.git] / inet / gethstbyad_r.c

diff --git a/inet/gethstbyad_r.c b/inet/gethstbyad_r.c
index 4d6436f..d8e4988 100644 (file)
--- a/inet/gethstbyad_r.c
+++ b/inet/gethstbyad_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2000,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000,2002,2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <netdb.h>
 #include <string.h>
@@ -33,7 +32,7 @@
    be performed.  */
 #define PREPROCESS \
   if (len == sizeof (struct in6_addr)                                        \
-      && __builtin_expect (memcmp (&INTUSE(in6addr_any), addr,               \
+      && __builtin_expect (memcmp (&in6addr_any, addr,                       \
                                   sizeof (struct in6_addr)), 1) == 0)        \
     {                                                                        \
       *h_errnop = HOST_NOT_FOUND;                                            \
@@ -48,6 +47,6 @@
     }
 
 /* Special name for the lookup function.  */
-#define DB_LOOKUP_FCT __nss_hosts_lookup
+#define DB_LOOKUP_FCT __nss_hosts_lookup2
 
 #include "../nss/getXXbyYY_r.c"