diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
| commit | 0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (patch) | |
| tree | 8239768e506a03837019c4f02c8ab949c04a0818 /libX11/nls | |
| parent | 7dbaa1cffdf176f803f2c7069fb6810e16a86f72 (diff) | |
| parent | a473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (diff) | |
| download | vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.gz vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.bz2 vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013
Conflicts:
libXinerama/src/Xinerama.c
Diffstat (limited to 'libX11/nls')
45 files changed, 3 insertions, 88 deletions
diff --git a/libX11/nls/C/XLC_LOCALE.pre b/libX11/nls/C/XLC_LOCALE.pre index 4653930d2..8334363df 100644 --- a/libX11/nls/C/XLC_LOCALE.pre +++ b/libX11/nls/C/XLC_LOCALE.pre @@ -33,10 +33,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/armscii-8/XLC_LOCALE.pre b/libX11/nls/armscii-8/XLC_LOCALE.pre index 72013f711..4fab63948 100644 --- a/libX11/nls/armscii-8/XLC_LOCALE.pre +++ b/libX11/nls/armscii-8/XLC_LOCALE.pre @@ -51,9 +51,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/compose.dir.pre b/libX11/nls/compose.dir.pre index fa267ce4a..455070f3d 100644 --- a/libX11/nls/compose.dir.pre +++ b/libX11/nls/compose.dir.pre @@ -386,7 +386,7 @@ ja_JP.UTF-8/Compose: ja_JP.UTF-8 en_US.UTF-8/Compose: ka_GE.UTF-8 en_US.UTF-8/Compose: kk_KZ.UTF-8 en_US.UTF-8/Compose: kl_GL.UTF-8 -km_KH.UTF-8/Compose: mk_KH.UTF-8 +km_KH.UTF-8/Compose: km_KH.UTF-8 en_US.UTF-8/Compose: kn_IN.UTF-8 ko_KR.UTF-8/Compose: ko_KR.UTF-8 en_US.UTF-8/Compose: ks_IN.UTF-8 diff --git a/libX11/nls/georgian-academy/XLC_LOCALE.pre b/libX11/nls/georgian-academy/XLC_LOCALE.pre index c51b1efa7..50bc3c8f4 100644 --- a/libX11/nls/georgian-academy/XLC_LOCALE.pre +++ b/libX11/nls/georgian-academy/XLC_LOCALE.pre @@ -51,9 +51,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/georgian-ps/XLC_LOCALE.pre b/libX11/nls/georgian-ps/XLC_LOCALE.pre index 470dcae2d..9f03ebb99 100644 --- a/libX11/nls/georgian-ps/XLC_LOCALE.pre +++ b/libX11/nls/georgian-ps/XLC_LOCALE.pre @@ -51,9 +51,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/ibm-cp1133/XLC_LOCALE.pre b/libX11/nls/ibm-cp1133/XLC_LOCALE.pre index f3b762c8f..cdc543a49 100644 --- a/libX11/nls/ibm-cp1133/XLC_LOCALE.pre +++ b/libX11/nls/ibm-cp1133/XLC_LOCALE.pre @@ -51,9 +51,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iscii-dev/XLC_LOCALE.pre b/libX11/nls/iscii-dev/XLC_LOCALE.pre index 1ddb1861c..e86315608 100644 --- a/libX11/nls/iscii-dev/XLC_LOCALE.pre +++ b/libX11/nls/iscii-dev/XLC_LOCALE.pre @@ -51,9 +51,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/isiri-3342/XLC_LOCALE.pre b/libX11/nls/isiri-3342/XLC_LOCALE.pre index 59072fcea..4ec74f87e 100644 --- a/libX11/nls/isiri-3342/XLC_LOCALE.pre +++ b/libX11/nls/isiri-3342/XLC_LOCALE.pre @@ -51,9 +51,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-1/XLC_LOCALE.pre b/libX11/nls/iso8859-1/XLC_LOCALE.pre index af09009b3..11772b80d 100644 --- a/libX11/nls/iso8859-1/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-1/XLC_LOCALE.pre @@ -42,10 +42,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-10/XLC_LOCALE.pre b/libX11/nls/iso8859-10/XLC_LOCALE.pre index a075c38c7..e6fc488b3 100644 --- a/libX11/nls/iso8859-10/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-10/XLC_LOCALE.pre @@ -43,10 +43,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-11/XLC_LOCALE.pre b/libX11/nls/iso8859-11/XLC_LOCALE.pre index 4949e654b..ee5073de0 100644 --- a/libX11/nls/iso8859-11/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-11/XLC_LOCALE.pre @@ -43,10 +43,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-13/XLC_LOCALE.pre b/libX11/nls/iso8859-13/XLC_LOCALE.pre index b12750048..82a5a0a2a 100644 --- a/libX11/nls/iso8859-13/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-13/XLC_LOCALE.pre @@ -43,10 +43,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-14/XLC_LOCALE.pre b/libX11/nls/iso8859-14/XLC_LOCALE.pre index 287f757be..05bbd2456 100644 --- a/libX11/nls/iso8859-14/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-14/XLC_LOCALE.pre @@ -43,10 +43,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-15/XLC_LOCALE.pre b/libX11/nls/iso8859-15/XLC_LOCALE.pre index 892187429..09ce32d36 100644 --- a/libX11/nls/iso8859-15/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-15/XLC_LOCALE.pre @@ -49,10 +49,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-2/XLC_LOCALE.pre b/libX11/nls/iso8859-2/XLC_LOCALE.pre index 8c70e8a4e..d7c6170d3 100644 --- a/libX11/nls/iso8859-2/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-2/XLC_LOCALE.pre @@ -43,10 +43,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-3/XLC_LOCALE.pre b/libX11/nls/iso8859-3/XLC_LOCALE.pre index e8f9e776f..5a79380f6 100644 --- a/libX11/nls/iso8859-3/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-3/XLC_LOCALE.pre @@ -43,10 +43,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-4/XLC_LOCALE.pre b/libX11/nls/iso8859-4/XLC_LOCALE.pre index 9bf101d07..c349a6f8e 100644 --- a/libX11/nls/iso8859-4/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-4/XLC_LOCALE.pre @@ -43,10 +43,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-5/XLC_LOCALE.pre b/libX11/nls/iso8859-5/XLC_LOCALE.pre index 5a78709ac..f271c6d54 100644 --- a/libX11/nls/iso8859-5/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-5/XLC_LOCALE.pre @@ -43,10 +43,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-6/XLC_LOCALE.pre b/libX11/nls/iso8859-6/XLC_LOCALE.pre index 5b0d4d4a5..c2a5107f7 100644 --- a/libX11/nls/iso8859-6/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-6/XLC_LOCALE.pre @@ -43,10 +43,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-7/XLC_LOCALE.pre b/libX11/nls/iso8859-7/XLC_LOCALE.pre index 9910bbe43..e1099ba2f 100644 --- a/libX11/nls/iso8859-7/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-7/XLC_LOCALE.pre @@ -43,10 +43,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-8/XLC_LOCALE.pre b/libX11/nls/iso8859-8/XLC_LOCALE.pre index 20a9f8f2a..7c4ed314c 100644 --- a/libX11/nls/iso8859-8/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-8/XLC_LOCALE.pre @@ -43,10 +43,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-9/XLC_LOCALE.pre b/libX11/nls/iso8859-9/XLC_LOCALE.pre index 4ffbce79f..2e0e66b01 100644 --- a/libX11/nls/iso8859-9/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-9/XLC_LOCALE.pre @@ -43,10 +43,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/iso8859-9e/XLC_LOCALE.pre b/libX11/nls/iso8859-9e/XLC_LOCALE.pre index cc7657850..8c252f1a0 100644 --- a/libX11/nls/iso8859-9e/XLC_LOCALE.pre +++ b/libX11/nls/iso8859-9e/XLC_LOCALE.pre @@ -55,10 +55,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/ja.JIS/XLC_LOCALE.pre b/libX11/nls/ja.JIS/XLC_LOCALE.pre index 4b771aca2..be037774c 100644 --- a/libX11/nls/ja.JIS/XLC_LOCALE.pre +++ b/libX11/nls/ja.JIS/XLC_LOCALE.pre @@ -65,10 +65,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/ja.SJIS/XLC_LOCALE.pre b/libX11/nls/ja.SJIS/XLC_LOCALE.pre index 671a98535..5064f1541 100644 --- a/libX11/nls/ja.SJIS/XLC_LOCALE.pre +++ b/libX11/nls/ja.SJIS/XLC_LOCALE.pre @@ -67,10 +67,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/ja/XLC_LOCALE.pre b/libX11/nls/ja/XLC_LOCALE.pre index 99decf0a0..0e205a476 100644 --- a/libX11/nls/ja/XLC_LOCALE.pre +++ b/libX11/nls/ja/XLC_LOCALE.pre @@ -67,10 +67,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/ko/XLC_LOCALE.pre b/libX11/nls/ko/XLC_LOCALE.pre index bda77b7f8..dc79e661b 100644 --- a/libX11/nls/ko/XLC_LOCALE.pre +++ b/libX11/nls/ko/XLC_LOCALE.pre @@ -43,10 +43,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/koi8-c/XLC_LOCALE.pre b/libX11/nls/koi8-c/XLC_LOCALE.pre index 68cd02f3b..adf5db0b7 100644 --- a/libX11/nls/koi8-c/XLC_LOCALE.pre +++ b/libX11/nls/koi8-c/XLC_LOCALE.pre @@ -51,9 +51,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/koi8-r/XLC_LOCALE.pre b/libX11/nls/koi8-r/XLC_LOCALE.pre index cda283e5d..1c487d784 100644 --- a/libX11/nls/koi8-r/XLC_LOCALE.pre +++ b/libX11/nls/koi8-r/XLC_LOCALE.pre @@ -52,9 +52,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/koi8-u/XLC_LOCALE.pre b/libX11/nls/koi8-u/XLC_LOCALE.pre index 860438ad6..0516d98e1 100644 --- a/libX11/nls/koi8-u/XLC_LOCALE.pre +++ b/libX11/nls/koi8-u/XLC_LOCALE.pre @@ -51,9 +51,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/locale.alias.pre b/libX11/nls/locale.alias.pre index 11d93f26e..1319492fb 100644 --- a/libX11/nls/locale.alias.pre +++ b/libX11/nls/locale.alias.pre @@ -732,8 +732,8 @@ kl_GL.iso88591: kl_GL.ISO8859-1 kl_GL.ISO-8859-1: kl_GL.ISO8859-1 kl_GL.iso885915: kl_GL.ISO8859-15 kl_GL.utf8: kl_GL.UTF-8 -km_KH: mk_KH.UTF-8 -km_KH.utf8: mk_KH.UTF-8 +km_KH: km_KH.UTF-8 +km_KH.utf8: km_KH.UTF-8 kn: kn_IN.UTF-8 kn_IN: kn_IN.UTF-8 kn_IN.utf8: kn_IN.UTF-8 diff --git a/libX11/nls/microsoft-cp1251/XLC_LOCALE.pre b/libX11/nls/microsoft-cp1251/XLC_LOCALE.pre index 77b9cd26e..c96d90858 100644 --- a/libX11/nls/microsoft-cp1251/XLC_LOCALE.pre +++ b/libX11/nls/microsoft-cp1251/XLC_LOCALE.pre @@ -56,10 +56,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/microsoft-cp1255/XLC_LOCALE.pre b/libX11/nls/microsoft-cp1255/XLC_LOCALE.pre index a9bea9c6c..c1b009bae 100644 --- a/libX11/nls/microsoft-cp1255/XLC_LOCALE.pre +++ b/libX11/nls/microsoft-cp1255/XLC_LOCALE.pre @@ -56,10 +56,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/microsoft-cp1256/XLC_LOCALE.pre b/libX11/nls/microsoft-cp1256/XLC_LOCALE.pre index 7fdb074f1..6165feedd 100644 --- a/libX11/nls/microsoft-cp1256/XLC_LOCALE.pre +++ b/libX11/nls/microsoft-cp1256/XLC_LOCALE.pre @@ -56,10 +56,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/mulelao-1/XLC_LOCALE.pre b/libX11/nls/mulelao-1/XLC_LOCALE.pre index 45a63452f..24af6d8c5 100644 --- a/libX11/nls/mulelao-1/XLC_LOCALE.pre +++ b/libX11/nls/mulelao-1/XLC_LOCALE.pre @@ -51,9 +51,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/nokhchi-1/XLC_LOCALE.pre b/libX11/nls/nokhchi-1/XLC_LOCALE.pre index 303867908..6f231cdef 100644 --- a/libX11/nls/nokhchi-1/XLC_LOCALE.pre +++ b/libX11/nls/nokhchi-1/XLC_LOCALE.pre @@ -51,9 +51,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/tatar-cyr/XLC_LOCALE.pre b/libX11/nls/tatar-cyr/XLC_LOCALE.pre index aaa95059e..c7c5581fc 100644 --- a/libX11/nls/tatar-cyr/XLC_LOCALE.pre +++ b/libX11/nls/tatar-cyr/XLC_LOCALE.pre @@ -56,10 +56,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/th_TH/XLC_LOCALE.pre b/libX11/nls/th_TH/XLC_LOCALE.pre index 8530f0b0d..3508c28ee 100644 --- a/libX11/nls/th_TH/XLC_LOCALE.pre +++ b/libX11/nls/th_TH/XLC_LOCALE.pre @@ -36,10 +36,8 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/tscii-0/XLC_LOCALE.pre b/libX11/nls/tscii-0/XLC_LOCALE.pre index 617bfdfe3..bffffe493 100644 --- a/libX11/nls/tscii-0/XLC_LOCALE.pre +++ b/libX11/nls/tscii-0/XLC_LOCALE.pre @@ -51,9 +51,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/vi_VN.tcvn/XLC_LOCALE.pre b/libX11/nls/vi_VN.tcvn/XLC_LOCALE.pre index d2897d6dd..90324fd30 100644 --- a/libX11/nls/vi_VN.tcvn/XLC_LOCALE.pre +++ b/libX11/nls/vi_VN.tcvn/XLC_LOCALE.pre @@ -51,9 +51,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/vi_VN.viscii/XLC_LOCALE.pre b/libX11/nls/vi_VN.viscii/XLC_LOCALE.pre index 9df03005c..730996bb1 100644 --- a/libX11/nls/vi_VN.viscii/XLC_LOCALE.pre +++ b/libX11/nls/vi_VN.viscii/XLC_LOCALE.pre @@ -51,9 +51,7 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif -#ifndef X_LOCALE use_stdc_env True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/zh_CN/XI18N_OBJS b/libX11/nls/zh_CN/XI18N_OBJS index 3ad1a6230..24d066be8 100644 --- a/libX11/nls/zh_CN/XI18N_OBJS +++ b/libX11/nls/zh_CN/XI18N_OBJS @@ -3,7 +3,6 @@ # XI18N objects table for zh locale # # -XLC common/xlocale _XlcEucLoader # XLC_open XLC common/xlibi18n _XlcGenericLoader # XLC_open XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister XOM common/xomGeneric _XomGenericOpenOM # XOM_open diff --git a/libX11/nls/zh_CN/XLC_LOCALE.pre b/libX11/nls/zh_CN/XLC_LOCALE.pre index 0065d8df1..2e95d3042 100644 --- a/libX11/nls/zh_CN/XLC_LOCALE.pre +++ b/libX11/nls/zh_CN/XLC_LOCALE.pre @@ -38,10 +38,8 @@ state_depend_encoding False wc_encoding_mask \x30000000 wc_shift_bits 7 -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/zh_TW.big5/XLC_LOCALE.pre b/libX11/nls/zh_TW.big5/XLC_LOCALE.pre index b04d02318..b8866e8fc 100644 --- a/libX11/nls/zh_TW.big5/XLC_LOCALE.pre +++ b/libX11/nls/zh_TW.big5/XLC_LOCALE.pre @@ -41,10 +41,8 @@ state_depend_encoding False wc_encoding_mask \x00038000 wc_shift_bits 8 -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { diff --git a/libX11/nls/zh_TW/XLC_LOCALE.pre b/libX11/nls/zh_TW/XLC_LOCALE.pre index d75ece85f..ffbb462ed 100644 --- a/libX11/nls/zh_TW/XLC_LOCALE.pre +++ b/libX11/nls/zh_TW/XLC_LOCALE.pre @@ -82,10 +82,8 @@ state_depend_encoding False wc_encoding_mask \x3fffc000 wc_shift_bits 7 -#ifndef X_LOCALE use_stdc_env True force_convert_to_mb True -#endif XCOMM cs0 class cs0 { |