X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=includes%2Flocale.h;h=1fb04e7d01f7d71798ca36f074ce0090c0da90ae;hb=76639d5beba6a6d857ae0c95a0b5da117a3d2dfd;hp=82fc21ba44da0c7438fa6ed653f4ff5ff1298f13;hpb=f730654332382c4051e7b839acfd30678dd94a60;p=pdclib.old

diff --git a/includes/locale.h b/includes/locale.h
index 82fc21b..1fb04e7 100644
--- a/includes/locale.h
+++ b/includes/locale.h
@@ -8,11 +8,8 @@
 
 #ifndef _PDCLIB_LOCALE_H
 #define _PDCLIB_LOCALE_H _PDCLIB_LOCALE_H
-
-#ifndef _PDCLIB_INT_H
-#define _PDCLIB_INT_H _PDCLIB_INT_H
 #include <_PDCLIB_int.h>
-#endif
+_PDCLIB_BEGIN_EXTERN_C
 
 #ifndef _PDCLIB_NULL_DEFINED
 #define _PDCLIB_NULL_DEFINED _PDCLIB_NULL_DEFINED
@@ -37,8 +34,6 @@
 */
 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  */
@@ -65,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.
 */
@@ -93,12 +85,43 @@ extern struct lconv _PDCLIB_lconv;
    Otherwise, returns a pointer to a string associated with the specified
    category for the new locale.
 */
-char * setlocale( int category, const char * locale );
+char * setlocale( int category, const char * locale ) _PDCLIB_nothrow;
 
 /* Returns a struct lconv initialized to the values appropriate for the current
    locale setting.
 */
-struct lconv * localeconv( void );
+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
+ * the existing locale.
+ *
+ * If newlocale is LC_GLOBAL_LOCALE, resets the thread's locale to use the 
+ * global locale.
+ *
+ * Returns the previous thread locale. If the thread had no previous locale, 
+ * returns the global locale.
+ */
+locale_t uselocale(locale_t newlocale);
+
+/* Returns a copy of loc */
+locale_t duplocale(locale_t loc);
+
+/* Frees the passed locale object */
+void freelocale(locale_t loc);
+
+#endif
 
+_PDCLIB_END_EXTERN_C
 #endif