diff options
Diffstat (limited to 'libX11/modules/lc/xlocale/lcJis.c')
| -rw-r--r-- | libX11/modules/lc/xlocale/lcJis.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libX11/modules/lc/xlocale/lcJis.c b/libX11/modules/lc/xlocale/lcJis.c index bdd46e36e..06c6b1fd7 100644 --- a/libX11/modules/lc/xlocale/lcJis.c +++ b/libX11/modules/lc/xlocale/lcJis.c @@ -41,7 +41,7 @@ #include "XlcGeneric.h" #include <stdio.h> -#if !defined(macII) && !defined(X_LOCALE) +#if !defined(X_LOCALE) #define STDCVT #endif @@ -222,7 +222,7 @@ mbstocs( if (num_args > 0) *((XlcCharSet *) args[0]) = charset; - + return unconv_num; } @@ -374,7 +374,7 @@ cstombs( if (num_args < 1) return -1; - + charset = (XlcCharSet) args[0]; codeset = GetCodeSetFromCharSet(state->lcd, charset); @@ -420,7 +420,7 @@ cstombs( buf_len /= codeset->length + encoding_len; if (csstr_len < buf_len) buf_len = csstr_len; - + cvt_length += buf_len * (encoding_len + codeset->length); if (bufptr) { while (buf_len--) { @@ -480,7 +480,7 @@ cstowcs( if (num_args < 1) return -1; - + codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0]); if (codeset == NULL) return -1; @@ -489,7 +489,7 @@ cstowcs( csstr_len /= length; if (csstr_len < buf_len) buf_len = csstr_len; - + code_mask = ~XLC_GENERIC(lcd, wc_encode_mask); wc_encoding = codeset->wc_encoding; wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits); @@ -539,7 +539,7 @@ create_conv( conv = (XlcConv) Xmalloc(sizeof(XlcConvRec)); if (conv == NULL) return (XlcConv) NULL; - + conv->methods = (XlcConvMethods) Xmalloc(sizeof(XlcConvMethodsRec)); if (conv->methods == NULL) goto err; @@ -551,11 +551,11 @@ create_conv( if (conv->state == NULL) goto err; bzero((char *) conv->state, sizeof(StateRec)); - + state = (State) conv->state; state->lcd = lcd; init_state(conv); - + return conv; err: @@ -762,7 +762,7 @@ stdc_wcstocs( length = 1; *tmp = '\0'; } - + if (length < 0) break; @@ -788,7 +788,7 @@ stdc_wcstocs( if (num_args > 0) *((XlcCharSet *) args[0]) = charset; - + return unconv_num; } @@ -810,7 +810,7 @@ stdc_cstowcs( DefineLocalBuf; XPointer buf, save_buf; int length, left, ret; - + left = length = *to_left * XLC_PUBLIC(lcd, mb_cur_max); buf = save_buf = (XPointer) AllocLocalBuf(length); if (buf == NULL) @@ -819,7 +819,7 @@ stdc_cstowcs( ret = cstombs(conv, from, from_left, &buf, &left, args, num_args); if (ret < 0) goto err; - + buf = save_buf; length -= left; if (stdc_mbstowcs(conv, &buf, &length, to, to_left, args, num_args) < 0) |