From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 13 Nov 2012 18:11:49 +0000 (+0000)
Subject: Define IPPORT_RESERVED in netdb.h for XPG4 and UNIX98 (bug 14838).
X-Git-Tag: glibc-2.17~214
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ca8931812236803335e0aa13d4c3158bf6c67de;p=thirdparty%2Fglibc.git

Define IPPORT_RESERVED in netdb.h for XPG4 and UNIX98 (bug 14838).
---

diff --git a/ChangeLog b/ChangeLog
index b3bd03f8206..cfb5a29e778 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-13  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #14838]
+	* resolv/netdb.h [__USE_XOPEN_EXTENDED] (IPPORT_RESERVED): Define
+	macro.
+
 2012-11-13  Marcus Shawcroft  <marcus.shawcroft@linaro.org>
 
 	* soft-fp/op-common.h (_FP_PACK_SEMIRAW): Move underflow
diff --git a/NEWS b/NEWS
index 753ce680d72..3ffdb801687 100644
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,7 @@ Version 2.17
   14562, 14568, 14576, 14579, 14583, 14587, 14595, 14602, 14610, 14621,
   14638, 14645, 14648, 14652, 14660, 14661, 14669, 14683, 14694, 14716,
   14743, 14767, 14783, 14784, 14785, 14793, 14796, 14797, 14801, 14805,
-  14807, 14809, 14811, 14815, 14821, 14824.
+  14807, 14809, 14811, 14815, 14821, 14824, 14838.
 
 * Port to ARM AArch64 contributed by Linaro.
 
diff --git a/resolv/netdb.h b/resolv/netdb.h
index 19bcc87fd86..41cf06f071b 100644
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -76,7 +76,7 @@ extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
 # define NO_ADDRESS	NO_DATA	/* No address, look for MX record.  */
 #endif
 
-#ifdef __USE_XOPEN2K
+#if defined __USE_XOPEN2K || defined __USE_XOPEN_EXTENDED
 /* Highest reserved Internet port number.  */
 # define IPPORT_RESERVED	1024
 #endif