X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=includes%2Flocale.h;h=a304f5e07158f6e0c4e6391579ddadc3afd183f4;hb=77e0f19332a2b4e64d48ecb48557ea7aefa2cc61;hp=0277016212ca6f57d090665d4e2749ffaa5dc4fe;hpb=e883af7e93561cd536df68eaf837f523e3d2594b;p=pdclib.old

diff --git a/includes/locale.h b/includes/locale.h
index 0277016..a304f5e 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,7 +34,6 @@
 */
 struct lconv
 {
-    struct _PDCLIB_ctype_t * ctype;  /* internal <ctype.h> information        */
     char * decimal_point;      /* decimal point character                     */
     char * thousands_sep;      /* character for seperating groups of digits   */
     char * grouping;           /* string indicating the size of digit groups  */
@@ -64,25 +60,22 @@ 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;
-
-/* LC_ALL
-   - entire locale
-   LC_COLLATE
-   - strcoll(), strxfrm()
-   LC_CTYPE
-   - <ctype.h>
-   LC_MONETARY
-   - monetary formatting as returned by localeconv
-   LC_NUMERIC
-   - decimal-point character for printf() / scanf() functions, string
-     conversions, and nonmonetary formattign as returned by localeconv
-   LC_TIME
-   - strftime(), wcsftime()
-
-   First arguments to setlocale().
+/* First arguments to setlocale().
+   TODO: Beware, values might change before v0.6 is released.
 */
+/* Entire locale */
+#define LC_ALL      -1
+/* Collation (strcoll(), strxfrm()) */
+#define LC_COLLATE  0
+/* Character types (<ctype.h>) */
+#define LC_CTYPE    1
+/* Monetary formatting (as returned by localeconv) */
+#define LC_MONETARY 2
+/* Decimal-point character (for printf() / scanf() functions), string
+   conversions, nonmonetary formatting as returned by localeconv              */
+#define LC_NUMERIC  3
+/* Time formats (strftime(), wcsftime()) */
+#define LC_TIME     4
 
 /* The category parameter can be any of the LC_* macros to specify if the call
    to setlocale() shall affect the entire locale or only a portion thereof.
@@ -92,12 +85,56 @@ 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)
+#define LC_COLLATE_MASK  (1 << LC_COLLATE)
+#define LC_CTYPE_MASK    (1 << LC_CTYPE)
+#define LC_MONETARY_MASK (1 << LC_MONETARY)
+#define LC_NUMERIC_MASK  (1 << LC_NUMERIC)
+#define LC_TIME_MASK     (1 << LC_TIME) 
+#define LC_ALL_MASK      (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MONETARY_MASK | \
+                          LC_NUMERIC_MASK | LC_TIME_MASK)
+
+
+/* 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)
+
+#ifdef _PDCLIB_LOCALE_METHOD
+
+locale_t newlocale(int category_mask, const char *locale, locale_t base); 
+
+/* 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
+
+#endif
 
+_PDCLIB_END_EXTERN_C
 #endif