From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 26 Jan 2001 09:25:28 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.20~16731
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d0376ea79948058e20255d6fb099dd946bce3bdf;p=platform%2Fupstream%2Flinaro-glibc.git

Update.

	* locale/langinfo.h: Correct logic in #ifs when defining YESSTR
	and NOSTR.
---

diff --git a/ChangeLog b/ChangeLog
index a8bd0d6..631ecd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-01-26  Ulrich Drepper  <drepper@redhat.com>
 
+	* locale/langinfo.h: Correct logic in #ifs when defining YESSTR
+	and NOSTR.
+
 	* locale/Makefile (headers): Add bits/locale.h.
 	* locale/langinfo.h: Don't include <locale.h>.  Include <bits/locale.h>
 	and use __LC_ constants instead of LC_.
diff --git a/locale/langinfo.h b/locale/langinfo.h
index 8b58fab..c2e312f 100644
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -488,11 +488,11 @@ enum
   __NOEXPR,			/* Regex matching ``no'' input.  */
 #define NOEXPR			__NOEXPR
   __YESSTR,			/* Output string for ``yes''.  */
-#if defined __USE_GNU || (defined __USE_XOPEN || !defined __USE_XOPEN2K)
+#if defined __USE_GNU || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
 # define YESSTR			__YESSTR
 #endif
   __NOSTR,			/* Output string for ``no''.  */
-#if defined __USE_GNU || (defined __USE_XOPEN || !defined __USE_XOPEN2K)
+#if defined __USE_GNU || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
 # define NOSTR			__NOSTR
 #endif
   _NL_NUM_LC_MESSAGES,