Thread-local locale handling part of XPG7.

I incorrectly enabled the definitions for XPG6.

diff --git a/ChangeLog b/ChangeLog
index 7e88049..c48442d 100644 (file)
--- 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 b24ae24..2aa19e7 100644 (file)
--- 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