diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-26 10:26:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-26 10:26:21 +0200 |
| commit | be8a3ecf0bebc7134452778070cd83b7decf7f71 (patch) | |
| tree | e3a5d81a99754c393062ed811bece6e0787e3767 /libX11/modules/im/ximcp/imInt.c | |
| parent | 7403278d95051a554e2cbec3fafdde8ce9c6d200 (diff) | |
| parent | 5ee5b91b019005aa27273dff01388a68c12be293 (diff) | |
| download | vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.tar.gz vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.tar.bz2 vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa fontconfig libX11 libxcb libxcb/xcb-proto xkeyboard-config git update 26 Aug 2013
Diffstat (limited to 'libX11/modules/im/ximcp/imInt.c')
| -rw-r--r-- | libX11/modules/im/ximcp/imInt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libX11/modules/im/ximcp/imInt.c b/libX11/modules/im/ximcp/imInt.c index 9af41a46f..aceb5fdf7 100644 --- a/libX11/modules/im/ximcp/imInt.c +++ b/libX11/modules/im/ximcp/imInt.c @@ -49,7 +49,7 @@ _XimSetIMStructureList( Xim *xim; if(!(_XimCurrentIMlist)) { - if(!(_XimCurrentIMlist = (Xim *)Xmalloc(sizeof(Xim)))) + if(!(_XimCurrentIMlist = Xmalloc(sizeof(Xim)))) return False; _XimCurrentIMlist[0] = im; _XimCurrentIMcount = 1; @@ -62,7 +62,7 @@ _XimSetIMStructureList( } } if(i >= _XimCurrentIMcount) { - if(!(xim = (Xim *)Xrealloc(_XimCurrentIMlist, + if(!(xim = Xrealloc(_XimCurrentIMlist, ((i + 1) * sizeof(Xim))))) return False; _XimCurrentIMlist = xim; |