conformtest: Add langinfo.h expectations for YESSTR, NOSTR [committed]

[Joseph Myers]

The conformtest expectations for langinfo.h fail to include the YESSTR
and NOSTR constants that were present in UNIX98 and earlier XPG
standards.  This patch adds those expectations, so fixing three
XFAILs.

Tested for x86_64 and x86.  Committed.

2016-04-28  Joseph Myers  <joseph@codesourcery.com>

	* conform/data/langinfo.h-data [XPG3 || XPG4 || UNIX98] (YESSTR):
	Expect constant.
	[XPG3 || XPG4 || UNIX98] (NOSTR): Likewise.
	* conform/Makefile (test-xfail-XPG3/langinfo.h/conform): Remove
	variable.
	(test-xfail-XPG4/langinfo.h/conform): Likewise.
	(test-xfail-UNIX98/langinfo.h/conform): Likewise.

diff --git a/conform/Makefile b/conform/Makefile
index 7665f77..06c4ff3 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -165,7 +165,6 @@ test-xfail-XOPEN2K8/ndbm.h/conform = yes
 # Unsorted expected failures.
 test-xfail-XPG3/fcntl.h/conform = yes
 test-xfail-XPG3/ftw.h/conform = yes
-test-xfail-XPG3/langinfo.h/conform = yes
 test-xfail-XPG3/limits.h/conform = yes
 test-xfail-XPG3/pwd.h/conform = yes
 test-xfail-XPG3/search.h/conform = yes
@@ -181,7 +180,6 @@ test-xfail-XPG3/time.h/conform = yes
 test-xfail-XPG3/unistd.h/conform = yes
 test-xfail-XPG4/arpa/inet.h/conform = yes
 test-xfail-XPG4/fcntl.h/conform = yes
-test-xfail-XPG4/langinfo.h/conform = yes
 test-xfail-XPG4/netdb.h/conform = yes
 test-xfail-XPG4/netinet/in.h/conform = yes
 test-xfail-XPG4/signal.h/conform = yes
@@ -198,7 +196,6 @@ test-xfail-XPG4/utmpx.h/conform = yes
 test-xfail-POSIX/sys/wait.h/conform = yes
 test-xfail-UNIX98/arpa/inet.h/conform = yes
 test-xfail-UNIX98/fcntl.h/conform = yes
-test-xfail-UNIX98/langinfo.h/conform = yes
 test-xfail-UNIX98/netdb.h/conform = yes
 test-xfail-UNIX98/netinet/in.h/conform = yes
 test-xfail-UNIX98/signal.h/conform = yes
diff --git a/conform/data/langinfo.h-data b/conform/data/langinfo.h-data
index 51dd925..b80fef2 100644
--- a/conform/data/langinfo.h-data
+++ b/conform/data/langinfo.h-data
@@ -55,6 +55,11 @@ constant YESEXPR
 constant NOEXPR
 constant CRNCYSTR
 
+# if defined XPG3 || defined XPG4 || defined UNIX98
+constant YESSTR
+constant NOSTR
+# endif
+
 type nl_item
 # if defined XOPEN2K8 || defined POSIX2008
 type locale_t

-- 
Joseph S. Myers
joseph@codesourcery.com