From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 1 May 2012 19:58:35 +0000 (+0000)
Subject: conformtest: Use correct feature test macros for XPG4.
X-Git-Tag: glibc-2.16-tps~515
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73c5ebe3441e17ba7b53a3bb00a6a91b569aeef6;p=thirdparty%2Fglibc.git

conformtest: Use correct feature test macros for XPG4.
---

diff --git a/ChangeLog b/ChangeLog
index 286f58be421..5edfd3ee57c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-01  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/conformtest.pl: Define _XOPEN_SOURCE as well as
+	_XOPEN_SOURCE_EXTENDED for XPG4.
+
 	* conform/conformtest.pl: Handle "symbol" lines for allow-header.
 
 	* Makeconfig (localtime): Remove variable.
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index a14aa09eeb3..25e05a2998d 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -37,7 +37,7 @@ $CFLAGS{"ISO99"} = "-std=c99";
 $CFLAGS{"ISO11"} = "-std=c1x -D_ISOC11_SOURCE";
 $CFLAGS{"POSIX"} = "-D_POSIX_C_SOURCE=199912 -ansi";
 $CFLAGS{"XPG3"} = "-D_XOPEN_SOURCE";
-$CFLAGS{"XPG4"} = "-D_XOPEN_SOURCE_EXTENDED";
+$CFLAGS{"XPG4"} = "-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED";
 $CFLAGS{"UNIX98"} = "-D_XOPEN_SOURCE=500";
 $CFLAGS{"XOPEN2K"} = "-D_XOPEN_SOURCE=600";
 $CFLAGS{"XOPEN2K8"} = "-std=c99 -D_XOPEN_SOURCE=700";