aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-26 09:25:28 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-26 09:25:28 +0000
commitd0376ea79948058e20255d6fb099dd946bce3bdf (patch)
tree6360360670b5103f684ca0465f680b821f892800
parent3e154a6f9373a15924ffe226df044194b633e3ac (diff)
downloadglibc-d0376ea79948058e20255d6fb099dd946bce3bdf.zip
glibc-d0376ea79948058e20255d6fb099dd946bce3bdf.tar.gz
glibc-d0376ea79948058e20255d6fb099dd946bce3bdf.tar.bz2
Update.
* locale/langinfo.h: Correct logic in #ifs when defining YESSTR and NOSTR.
-rw-r--r--ChangeLog3
-rw-r--r--locale/langinfo.h4
2 files changed, 5 insertions, 2 deletions
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,