summary refs log tree commit diff
path: root/stdlib
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-05-17 15:51:55 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-05-17 15:51:55 +0000
commit0014680d6a5bdeb4fe17682450105ebed19f35da (patch)
tree42a8f163ae8adf20cc9b6b7fa5d07064ccb009b1 /stdlib
parent9ff81856dbbbcedb63de546d10dc1cdaeb982a6b (diff)
downloadglibc-0014680d6a5bdeb4fe17682450105ebed19f35da.tar.gz
glibc-0014680d6a5bdeb4fe17682450105ebed19f35da.tar.xz
glibc-0014680d6a5bdeb4fe17682450105ebed19f35da.zip
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.
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/stdlib.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index ad9c6c8904..f0dc951acf 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:  */