Changeset 1796

Timestamp:

Jan 28, 2005, 8:19:00 PM (21 years ago)

Author:

bird

Message:

Added the C99 lconv stuff.

Location:

trunk/src/emx

Files:

• include/locale.h (modified) (2 diffs, 1 prop)
• src/lib/locale/locale_lconv.c (modified) (1 diff, 1 prop)
• src/lib/locale/setlocale.c (modified) (3 diffs, 1 prop)

trunk/src/emx/include/locale.h

@@ -64 +64 @@
         char    p_sign_posn;            /** positioning of non-negative monetary sign */
         char    n_sign_posn;            /** positioning of negative monetary sign */
-#if 0 /* bird: we don't have this information (it's C99 stuff btw). */
         char    int_p_cs_precedes;
         char    int_n_cs_precedes;
@@ -71 +70 @@
         char    int_p_sign_posn;
         char    int_n_sign_posn;
-#endif
 };
 

trunk/src/emx/src/lib/locale/locale_lconv.c

@@ -56 +56 @@
         CHAR_MAX,                       //int_n_sep_by_space;
         CHAR_MAX,                       //int_p_sign_posn;
-        CHAR_MAX,                        //int_n_sign_posn;
-        -1
+        CHAR_MAX                        //int_n_sign_posn;
     },
 

trunk/src/emx/src/lib/locale/setlocale.c

@@ -970 +970 @@
         pLconv->s.p_sign_posn       = pULconv->p_sign_posn;
         pLconv->s.n_sign_posn       = pULconv->n_sign_posn;
+        /* we fake the international variants here. */
+        pLconv->s.int_p_cs_precedes = pULconv->p_cs_precedes;
+        pLconv->s.int_n_cs_precedes = pULconv->n_cs_precedes;
+        pLconv->s.int_p_sep_by_space= pULconv->p_sep_by_space;
+        pLconv->s.int_n_sep_by_space= pULconv->n_sep_by_space;
+        pLconv->s.int_p_sign_posn   = pULconv->p_sign_posn;
+        pLconv->s.int_n_sign_posn   = pULconv->n_sign_posn;
+
 #undef CONVERT_UCS
 
@@ -997 +1005 @@
         pLconv->s.p_sign_posn       = -1;
         pLconv->s.n_sign_posn       = -1;
+        pLconv->s.int_p_cs_precedes = -1;
+        pLconv->s.int_n_cs_precedes = -1;
+        pLconv->s.int_p_sep_by_space= -1;
+        pLconv->s.int_n_sep_by_space= -1;
+        pLconv->s.int_p_sign_posn   = -1;
+        pLconv->s.int_n_sign_posn   = -1;
 
         return 0;
@@ -1559 +1573 @@
         __libc_gLocaleLconv.s.p_sign_posn        = pTemp->Lconv.s.p_sign_posn;
         __libc_gLocaleLconv.s.n_sign_posn        = pTemp->Lconv.s.n_sign_posn;
+        __libc_gLocaleLconv.s.int_p_cs_precedes  = pTemp->Lconv.s.int_p_cs_precedes;
+        __libc_gLocaleLconv.s.int_n_cs_precedes  = pTemp->Lconv.s.int_n_cs_precedes;
+        __libc_gLocaleLconv.s.int_p_sep_by_space = pTemp->Lconv.s.int_p_sep_by_space;
+        __libc_gLocaleLconv.s.int_n_sep_by_space = pTemp->Lconv.s.int_n_sep_by_space;
+        __libc_gLocaleLconv.s.int_p_sign_posn    = pTemp->Lconv.s.int_p_sign_posn;
+        __libc_gLocaleLconv.s.int_n_sign_posn    = pTemp->Lconv.s.int_n_sign_posn;
         __libc_gLocaleLconv.pszCrncyStr          = pTemp->Lconv.pszCrncyStr;
         pTemp->afProcessed[LC_MONETARY + 1] = 0;