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

diff --git a/includes/locale.h b/includes/locale.h
index 21221e3..a304f5e 100644
--- 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,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;
-
 /* First arguments to setlocale().
    TODO: Beware, values might change before v0.6 is released.
 */
 /* Entire locale */
-#define LC_ALL      0
+#define LC_ALL      -1
 /* Collation (strcoll(), strxfrm()) */
-#define LC_COLLATE  1
+#define LC_COLLATE  0
 /* Character types (<ctype.h>) */
-#define LC_CTYPE    2
+#define LC_CTYPE    1
 /* Monetary formatting (as returned by localeconv) */
-#define LC_MONETARY 3
+#define LC_MONETARY 2
 /* Decimal-point character (for printf() / scanf() functions), string
    conversions, nonmonetary formatting as returned by localeconv              */
-#define LC_NUMERIC  4
+#define LC_NUMERIC  3
 /* Time formats (strftime(), wcsftime()) */
-#define LC_TIME     5
+#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.
@@ -98,8 +93,26 @@ char * setlocale( int category, const char * locale ) _PDCLIB_nothrow;
 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
@@ -118,6 +131,7 @@ locale_t duplocale(locale_t loc);
 
 /* Frees the passed locale object */
 void freelocale(locale_t loc);
+#endif
 
 #endif