PDCLIB-1 PDCLIB-2 PDCLIB-9 PDCLIB-12: Add thread specific locale support; migrate...

[pdclib] / includes / locale.h

diff --git a/includes/locale.h b/includes/locale.h
index 21221e33e64df11f71a6eff1d767814d8fcc53d8..1fb04e7d01f7d71798ca36f074ce0090c0da90ae 100644 (file)
--- a/includes/locale.h
+++ b/includes/locale.h
@@ -34,8 +34,6 @@ _PDCLIB_BEGIN_EXTERN_C
 */
 struct lconv
 {
-    struct _PDCLIB_ctype_t * ctype;  /* internal <ctype.h> information        */
-    char * _PDCLIB_errno_texts[_PDCLIB_ERRNO_MAX]; /* strerror() / perror()   */
     char * decimal_point;      /* decimal point character                     */
     char * thousands_sep;      /* character for seperating groups of digits   */
     char * grouping;           /* string indicating the size of digit groups  */
@@ -62,9 +60,6 @@ struct lconv
     char int_n_sign_posn;      /* Same as above, for international format     */
 };
 
-/* This is strictly internal, and visible here for technical reasons only. */
-extern struct lconv _PDCLIB_lconv;
-
 /* First arguments to setlocale().
    TODO: Beware, values might change before v0.6 is released.
 */
@@ -98,8 +93,14 @@ char * setlocale( int category, const char * locale ) _PDCLIB_nothrow;
 struct lconv * localeconv( void ) _PDCLIB_nothrow;
 
 #if _PDCLIB_POSIX_MIN(2008)
+
+/* POSIX locale type */
 typedef _PDCLIB_locale_t locale_t;
 
+/* Global locale */
+extern struct _PDCLIB_locale _PDCLIB_global_locale;
+#define LC_GLOBAL_LOCALE (&_PDCLIB_global_locale)
+
 /* Set the thread locale to newlocale
  *
  * If newlocale is (locale_t)0, then doesn't change the locale and just returns