diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-09 11:32:22 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-09 11:32:22 +0200 |
| commit | f8f0209a691e0d0838d1ef9d602ebacafee2a233 (patch) | |
| tree | 591285bbfdecaf92be8bb3fd2291f9f17bc2c822 /libX11 | |
| parent | ecf91092594b6cd72548f6a675515e84516398ff (diff) | |
| parent | c6069c33e3a4a6d48aa059dbe9a78702dabff9cc (diff) | |
| download | vcxsrv-f8f0209a691e0d0838d1ef9d602ebacafee2a233.tar.gz vcxsrv-f8f0209a691e0d0838d1ef9d602ebacafee2a233.tar.bz2 vcxsrv-f8f0209a691e0d0838d1ef9d602ebacafee2a233.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libxcb mesa git update 9 Jul 2013
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/modules/lc/gen/lcGenConv.c | 28 | ||||
| -rw-r--r-- | libX11/nls/C/XI18N_OBJS | 2 | ||||
| -rw-r--r-- | libX11/nls/en_US.UTF-8/XI18N_OBJS | 5 | ||||
| -rw-r--r-- | libX11/nls/iso8859-1/XI18N_OBJS | 2 |
4 files changed, 4 insertions, 33 deletions
diff --git a/libX11/modules/lc/gen/lcGenConv.c b/libX11/modules/lc/gen/lcGenConv.c index 42d63c529..1041dc709 100644 --- a/libX11/modules/lc/gen/lcGenConv.c +++ b/libX11/modules/lc/gen/lcGenConv.c @@ -764,9 +764,6 @@ mbstowcs_org( return( 0 ); } - if (*from_left > *to_left) - *from_left = *to_left; - while (*from_left && *to_left) { ch = *inbufptr++; @@ -921,9 +918,6 @@ wcstombs_org( int defstr_len = strlen(default_string); - if (*from_left > *to_left) - *from_left = *to_left; - while (*from_left && *to_left) { wc = *inbufptr++; @@ -1080,9 +1074,6 @@ wcstocts( int from_size = *from_left; char *ext_seg_len = NULL; - if (*from_left > *to_left) - *from_left = *to_left; - while (*from_left && *to_left) { wc = *inbufptr++; @@ -1272,9 +1263,6 @@ ctstowcs( return( 0 ); } - if (*from_left > *to_left) - *from_left = *to_left; - while (*from_left && *to_left) { ch = *inbufptr++; @@ -1666,9 +1654,6 @@ mbstostr( return( 0 ); } - if (*from_left > *to_left) - *from_left = *to_left; - while (*from_left && *to_left) { ch = *inbufptr++; @@ -1956,10 +1941,6 @@ wcstostr( const char *default_string = XLC_PUBLIC(lcd, default_string); int defstr_len = strlen(default_string); - - if (*from_left > *to_left) - *from_left = *to_left; - while (*from_left && *to_left) { wc = *inbufptr++; @@ -2114,9 +2095,6 @@ wctocs( char *outbufptr = *to; int from_size = *from_left; - if (*from_left > *to_left) - *from_left = *to_left; - if (*from_left && *to_left) { wc = *inbufptr++; @@ -2427,9 +2405,6 @@ strtombs( char *outbufptr = *to; int from_size = *from_left; - if (*from_left > *to_left) - *from_left = *to_left; - while (*from_left && *to_left) { ch = *inbufptr++; @@ -2537,9 +2512,6 @@ strtowcs( wchar_t *outbufptr = (wchar_t *)*to; int from_size = *from_left; - if (*from_left > *to_left) - *from_left = *to_left; - while (*from_left && *to_left) { ch = *inbufptr++; diff --git a/libX11/nls/C/XI18N_OBJS b/libX11/nls/C/XI18N_OBJS index 32e4f3588..3a9a1bb5a 100644 --- a/libX11/nls/C/XI18N_OBJS +++ b/libX11/nls/C/XI18N_OBJS @@ -3,6 +3,6 @@ # XI18N objects table for euro locales # XLC common/xlibi18n _XlcGenericLoader # XLC_open -XIM common/ximcp _XimOpenIM # XIM_open +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister XOM common/xomGeneric _XomGenericOpenOM # XOM_open diff --git a/libX11/nls/en_US.UTF-8/XI18N_OBJS b/libX11/nls/en_US.UTF-8/XI18N_OBJS index f201bf435..97b30b976 100644 --- a/libX11/nls/en_US.UTF-8/XI18N_OBJS +++ b/libX11/nls/en_US.UTF-8/XI18N_OBJS @@ -3,6 +3,5 @@ # XI18N objects table for euro locales # XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open -XOM common/xomLTRTTB _XomGenericOpenOM # XOM_open -XIM common/xiiimp _SwitchOpenIM # XIM_open -XIM common/xiiimp _XimpLocalOpenIM # XIM_open +XOM common/xomGeneric _XomGenericOpenOM # XOM_open +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister diff --git a/libX11/nls/iso8859-1/XI18N_OBJS b/libX11/nls/iso8859-1/XI18N_OBJS index 32e4f3588..3a9a1bb5a 100644 --- a/libX11/nls/iso8859-1/XI18N_OBJS +++ b/libX11/nls/iso8859-1/XI18N_OBJS @@ -3,6 +3,6 @@ # XI18N objects table for euro locales # XLC common/xlibi18n _XlcGenericLoader # XLC_open -XIM common/ximcp _XimOpenIM # XIM_open +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister XOM common/xomGeneric _XomGenericOpenOM # XOM_open |