PDCLIB-2 PDCLIB-8: Implement mbrtowc using mbrtoc32/mbrtoc16 depending upon definitio...

[pdclib.old] / internals / _PDCLIB_int.h

diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h
index 52ba8b35f607b82cd5133562abaa042b045dbea9..9ff9e69e321b3a1809747449bed85d697984e1ed 100644 (file)
--- a/internals/_PDCLIB_int.h
+++ b/internals/_PDCLIB_int.h
@@ -348,16 +348,23 @@ typedef struct _PDCLIB_mbstate {
                  char    _StC [124];
     };
 
-    union {
-        /* c16/related functions: Surrogate storage
-         *
-         * If zero, no surrogate pending. If nonzero, surrogate.
-         */
-        _PDCLIB_uint16_t     _Surrogate;
-
-        /* Reserved for potential mbtoutf8/etc functions */
-        unsigned char        _U8[4];
-    };
+    /* c16/related functions: Surrogate storage
+     *
+     * If zero, no surrogate pending. If nonzero, surrogate.
+     */
+    _PDCLIB_uint16_t     _Surrogate;
+
+    /* In cases where the underlying codec is capable of regurgitating a 
+     * character without consuming any extra input (e.g. a surrogate pair in a
+     * UCS-4 to UTF-16 conversion) then these fields are used to track that 
+     * state. In particular, they are used to buffer/fake the input for mbrtowc
+     * and similar functions.
+     *
+     * See _PDCLIB_encoding.h for values of _PendState and the resultant value 
+     * in _PendChar.
+     */
+    unsigned char _PendState;
+             char _PendChar;
 } _PDCLIB_mbstate_t;
 
 typedef struct _PDCLIB_charcodec *_PDCLIB_charcodec_t;