From 505cf2c00a0b43819f2b90069b42ace79034290d Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 12 Jan 2010 16:43:00 -0800
Subject: [PATCH] Fix up netdb.h for XPG7.

---
 ChangeLog                   | 9 +++++++--
 conform/conformtest.pl      | 1 +
 conform/data/sys/uio.h-data | 2 +-
 resolv/netdb.h              | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb5d715..ab85512 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
 2010-01-12  Ulrich Drepper  <drepper@redhat.com>
 
-	* conform/conformtest.pl (checknamespace): Implement tag for
-	allow-header.
+	* resolv/netdb.h: Don't define old resolver macros for XPG7.
+
+	* conform/data/sys/uio.h-data: Don't exclude POSIX2008.
+
+	* conform/conformtest.pl: Implement tag for allow-header.
+	Fix newline handling in allow-header implementation.
+
 	* conform/data/time.h-data: Use allow-header instead of duplicating
 	information.
 
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index 4cf571f..d324d81 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -1048,6 +1048,7 @@ while ($#headers >= 0) {
 
     open (ALLOW, "$CC -E -D$dialect - < data/$ah-data |");
     acontrol: while (<ALLOW>) {
+      chop;
       next acontrol if (/^#/);
       next acontrol if (/^[	]*$/);
 
diff --git a/conform/data/sys/uio.h-data b/conform/data/sys/uio.h-data
index 7833e722..03d0a3b 100644
--- a/conform/data/sys/uio.h-data
+++ b/conform/data/sys/uio.h-data
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined POSIX && !defined POSIX2008
+#if !defined ISO && !defined POSIX
 type {struct iovec}
 
 element {struct iovec} {void*} iov_base
diff --git a/resolv/netdb.h b/resolv/netdb.h
index dc1f7ce..0835939 100644
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -1,4 +1,4 @@
-  /* Copyright (C) 1996-2002, 2003, 2004, 2009 Free Software Foundation, Inc.
+  /* Copyright (C) 1996-2004, 2009, 2010 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
@@ -53,6 +53,7 @@
 
 __BEGIN_DECLS
 
+#if defined __USE_GNU || !defined __USE_XOPEN2K8
 /* Error status for non-reentrant lookup functions.
    We use a macro to access always the thread-specific `h_errno' variable.  */
 #define h_errno (*__h_errno_location ())
@@ -69,6 +70,7 @@ extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
 				   NOTIMP.  */
 #define	NO_DATA		4	/* Valid name, no data record of requested
 				   type.  */
+#endif
 #if defined __USE_MISC || defined __USE_GNU
 # define NETDB_INTERNAL	-1	/* See errno.  */
 # define NETDB_SUCCESS	0	/* No problem.  */
-- 
2.7.4