summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-08-23 10:56:08 -0700
committerUlrich Drepper <drepper@redhat.com>2009-08-23 10:56:08 -0700
commit659a63fb7ba0b2c9bc45034283a302afe56a6ebe (patch)
tree6896cfd8a365fe30ed0e1d78b2b5339a690ba2c3
parentcd16986ee3a4fa92c7e6b3f5a601a635a7cdd21a (diff)
downloadglibc-659a63fb7ba0b2c9bc45034283a302afe56a6ebe.tar.gz
glibc-659a63fb7ba0b2c9bc45034283a302afe56a6ebe.tar.xz
glibc-659a63fb7ba0b2c9bc45034283a302afe56a6ebe.zip
Thread-local locale handling part of XPG7.
I incorrectly enabled the definitions for XPG6.
-rw-r--r--ChangeLog5
-rw-r--r--locale/locale.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e88049818..c48442d988 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* locale/locale.h: Include xlocale.h and the thread-local locale
+	declarations for XPG7, not XPG6.
+
 2009-08-21  Andreas Schwab  <schwab@redhat.com>
 
 	* sysdeps/powerpc/powerpc32/____longjmp_chk.S: Removed.
diff --git a/locale/locale.h b/locale/locale.h
index b24ae245fe..2aa19e76ac 100644
--- a/locale/locale.h
+++ b/locale/locale.h
@@ -130,7 +130,7 @@ extern struct lconv *localeconv (void) __THROW;
 __END_NAMESPACE_STD
 
 
-#ifdef	__USE_XOPEN2K
+#ifdef	__USE_XOPEN2K8
 /* The concept of one static locale per category is not very well
    thought out.  Many applications will need to process its data using
    information from several different locales.  Another application is