aboutsummaryrefslogtreecommitdiff
path: root/libX11/modules/im/ximcp/imDefLkup.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
commitcb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch)
tree8b4e9e320258d5280ce454163c49363030626c1a /libX11/modules/im/ximcp/imDefLkup.c
parent213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff)
parentc87efef42f76c2ff0dcfad2842ab369beffd21de (diff)
downloadvcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/modules/im/ximcp/imDefLkup.c')
-rw-r--r--libX11/modules/im/ximcp/imDefLkup.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/libX11/modules/im/ximcp/imDefLkup.c b/libX11/modules/im/ximcp/imDefLkup.c
index 66e4add49..887f00bd3 100644
--- a/libX11/modules/im/ximcp/imDefLkup.c
+++ b/libX11/modules/im/ximcp/imDefLkup.c
@@ -11,7 +11,7 @@ in supporting documentation, and that the name of FUJITSU LIMITED
not be used in advertising or publicity pertaining to distribution
of the software without specific, written prior permission.
FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose.
+this software for any purpose.
It is provided "as is" without express or implied warranty.
FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
@@ -22,7 +22,7 @@ USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
- Author: Takashi Fujiwara FUJITSU LIMITED
+ Author: Takashi Fujiwara FUJITSU LIMITED
fujiwara@a80.tech.yk.fujitsu.co.jp
******************************************************************/
@@ -220,9 +220,9 @@ _XimRespSyncReply(
if (IS_FOCUSED(ic))
MARK_NEED_SYNC_REPLY(ic);
else
- _XimProcSyncReply(ic->core.im, ic);
+ _XimProcSyncReply((Xim)ic->core.im, ic);
}
-
+
return True;
}
@@ -893,13 +893,8 @@ _Ximctsconvert(
}
Public int
-_Ximctstombs(xim, from, from_len, to, to_len, state)
- XIM xim;
- char *from;
- int from_len;
- char *to;
- int to_len;
- Status *state;
+_Ximctstombs(XIM xim, char *from, int from_len,
+ char *to, int to_len, Status *state)
{
return _Ximctsconvert(((Xim)xim)->private.proto.ctom_conv,
from, from_len, to, to_len, state);
@@ -938,7 +933,7 @@ _Ximctstowcs(
/* Reset the converter. The CompoundText at 'from' starts in
initial state. */
_XlcResetConverter(conv);
-
+
from_left = from_len;
to_left = BUFSIZ;
from_cnvlen = 0;