diff options
Diffstat (limited to 'newlib/libc/stdlib/mbtowc_r.c')
| -rw-r--r-- | newlib/libc/stdlib/mbtowc_r.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c index 7f0dd11aa..c7c7effca 100644 --- a/newlib/libc/stdlib/mbtowc_r.c +++ b/newlib/libc/stdlib/mbtowc_r.c @@ -1,11 +1,10 @@ -#include <newlib.h> #include <stdlib.h> #include <locale.h> #include "mbctype.h" #include <wchar.h> #include <string.h> -#ifdef _MB_CAPABLE +#ifdef MB_CAPABLE typedef enum { ESCAPE, DOLLAR, BRACKET, AT, B, J, NUL, JIS_CHAR, OTHER, JIS_C_NUM } JIS_CHAR_TYPE; typedef enum { ASCII, JIS, A_ESC, A_ESC_DL, JIS_1, J_ESC, J_ESC_BR, @@ -40,7 +39,7 @@ static JIS_ACTION JIS_action_table[JIS_S_NUM][JIS_C_NUM] = { /* J_ESC */ { ERROR, ERROR, NOOP, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR }, /* J_ESC_BR */{ ERROR, ERROR, ERROR, ERROR, MAKE_A, MAKE_A, ERROR, ERROR, ERROR }, }; -#endif /* _MB_CAPABLE */ +#endif /* MB_CAPABLE */ /* we override the mbstate_t __count field for more complex encodings and use it store a state value */ #define __state __count @@ -64,7 +63,7 @@ _DEFUN (_mbtowc_r, (r, pwc, s, n, state), if (s != NULL && n == 0) return -2; -#ifdef _MB_CAPABLE +#ifdef MB_CAPABLE if (__lc_ctype == NULL || (strlen (__lc_ctype) <= 1)) { /* fall-through */ } @@ -456,7 +455,7 @@ _DEFUN (_mbtowc_r, (r, pwc, s, n, state), state->__state = curr_state; return -2; /* n < bytes needed */ } -#endif /* _MB_CAPABLE */ +#endif /* MB_CAPABLE */ /* otherwise this must be the "C" locale or unknown locale */ if (s == NULL) |