diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-27 08:37:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-27 08:37:52 +0200 |
| commit | 2a9be4af293f20fa33cc34fbc3b72e2235d91090 (patch) | |
| tree | d41608bda1d56be1aa96857dee20e988b53760a3 /libX11/modules | |
| parent | 9d53da0fbb9ae6df9a38ad40df4f53cd28287235 (diff) | |
| parent | d662d461634660f5c0f3998b5eb7d7ed3bd5a25f (diff) | |
| download | vcxsrv-2a9be4af293f20fa33cc34fbc3b72e2235d91090.tar.gz vcxsrv-2a9be4af293f20fa33cc34fbc3b72e2235d91090.tar.bz2 vcxsrv-2a9be4af293f20fa33cc34fbc3b72e2235d91090.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libX11/modules')
| -rw-r--r-- | libX11/modules/lc/gen/lcGenConv.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libX11/modules/lc/gen/lcGenConv.c b/libX11/modules/lc/gen/lcGenConv.c index 7a113a78a..42d63c529 100644 --- a/libX11/modules/lc/gen/lcGenConv.c +++ b/libX11/modules/lc/gen/lcGenConv.c @@ -1784,9 +1784,6 @@ mbtocs( return( 0 ); } - if (*from_left > *to_left) - *from_left = *to_left; - while (*from_left && *to_left) { ch = *inbufptr++; @@ -1872,7 +1869,7 @@ output: return -1; } - /* nomal end */ + /* normal end */ *from = (XPointer) inbufptr; *to = (XPointer) outbufptr; @@ -2171,7 +2168,7 @@ end: return -1; } - /* nomal end */ + /* normal end */ *from = (XPointer) inbufptr; *to = (XPointer) outbufptr; @@ -2225,7 +2222,7 @@ end: return -1; } - /* nomal end */ + /* normal end */ *from = (XPointer) src; *from_left = src_left; |