From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 17 May 2016 15:51:55 +0000 (+0000)
Subject: Do not declare grantpt, ptsname, unlockpt in stdlib.h for XPG3 (bug 20094).
X-Git-Tag: glibc-2.24~248
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0014680d6a5bdeb4fe17682450105ebed19f35da;p=thirdparty%2Fglibc.git

Do not declare grantpt, ptsname, unlockpt in stdlib.h for XPG3 (bug 20094).

stdlib.h declares grantpt, ptsname, unlockpt for __USE_XOPEN.  This
patch corrects the condition to __USE_XOPEN_EXTENDED (these functions
are new in XPG4).

Tested for x86_64 and x86 (testsuite, and that installed shared
libraries are unchanged by the patch).

	[BZ #20094]
	* stdlib/stdlib.h (grantpt): Declare if [__USE_XOPEN_EXTENDED],
	not [__USE_XOPEN].
	(unlockpt): Likewise.
	(ptsname): Likewise.
	* conform/Makefile (test-xfail-XPG3/stdlib.h/conform): Remove
	variable.
---

diff --git a/ChangeLog b/ChangeLog
index 2be1e216763..ce605c1e381 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2016-05-17  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #20094]
+	* stdlib/stdlib.h (grantpt): Declare if [__USE_XOPEN_EXTENDED],
+	not [__USE_XOPEN].
+	(unlockpt): Likewise.
+	(ptsname): Likewise.
+	* conform/Makefile (test-xfail-XPG3/stdlib.h/conform): Remove
+	variable.
+
 	[BZ #20076]
 	* io/sys/stat.h (S_IFSOCK): Define for [__USE_XOPEN_EXTENDED]
 	instead of [__USE_UNIX98].
diff --git a/conform/Makefile b/conform/Makefile
index f668b2e19a4..6c7b683ec2e 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -168,7 +168,6 @@ test-xfail-XPG3/limits.h/conform = yes
 test-xfail-XPG3/pwd.h/conform = yes
 test-xfail-XPG3/search.h/conform = yes
 test-xfail-XPG3/signal.h/conform = yes
-test-xfail-XPG3/stdlib.h/conform = yes
 test-xfail-XPG3/sys/wait.h/conform = yes
 test-xfail-XPG4/arpa/inet.h/conform = yes
 test-xfail-XPG4/netdb.h/conform = yes
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index ad9c6c89045..f0dc951acf7 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -876,7 +876,7 @@ extern void setkey (const char *__key) __THROW __nonnull ((1));
 extern int posix_openpt (int __oflag) __wur;
 #endif
 
-#ifdef __USE_XOPEN
+#ifdef __USE_XOPEN_EXTENDED
 /* The next four functions all take a master pseudo-tty fd and
    perform an operation on the associated slave:  */