about summary refs log tree commit diff
path: root/locale
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-08-25 23:53:55 +0000
committerUlrich Drepper <drepper@redhat.com>1999-08-25 23:53:55 +0000
commit7f42d3dd6f91a6336baceccd98dc7fe516d959fe (patch)
tree0942f9a13181fea447bfeac4b0078d6090bbb6b3 /locale
parent050838a4919a2dfb6da0124eacdfad0a22259251 (diff)
downloadglibc-7f42d3dd6f91a6336baceccd98dc7fe516d959fe.tar.gz
glibc-7f42d3dd6f91a6336baceccd98dc7fe516d959fe.tar.xz
glibc-7f42d3dd6f91a6336baceccd98dc7fe516d959fe.zip
Update.
	* conform/conformtest.pl (@headers): Add search.h, sched.h, regex.h,
	pwd.h, and pthread.h.
	* conform/data/pthread.h-data: New file.
	* conform/data/pwd.h-data: New file.
	* conform/data/regex.h-data: New file.
	* conform/data/sched.h-data: New file.
	* conform/data/search.h-data: New file.

	* NAMESPACE: Add REG_ for regex.h.

	* locale/langinfo.h: Don't define YESSTR and NOSTR for XPG6 since
	they are removed.
Diffstat (limited to 'locale')
-rw-r--r--locale/langinfo.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/locale/langinfo.h b/locale/langinfo.h
index 935a3818bf..cfcf7c75fa 100644
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -333,10 +333,12 @@ enum
 #define YESEXPR			YESEXPR
   NOEXPR,			/* Regex matching ``no'' input.  */
 #define NOEXPR			NOEXPR
-  YESSTR,			/* Output string for ``yes''.  */
-#define YESSTR			YESSTR
-  NOSTR,			/* Output string for ``no''.  */
-#define	NOSTR			NOSTR
+  __YESSTR,			/* Output string for ``yes''.  */
+  __NOSTR,			/* Output string for ``no''.  */
+#ifndef __USE_XOPEN2K
+# define YESSTR			__YESSTR
+# define NOSTR			__NOSTR
+#endif
   _NL_NUM_LC_MESSAGES,
 
   /* This marks the highest value used.  */