diff options
Diffstat (limited to 'modules/im/ximcp/imTransR.c')
| -rw-r--r-- | modules/im/ximcp/imTransR.c | 47 |
1 files changed, 18 insertions, 29 deletions
diff --git a/modules/im/ximcp/imTransR.c b/modules/im/ximcp/imTransR.c index 016c5e4..f36f77e 100644 --- a/modules/im/ximcp/imTransR.c +++ b/modules/im/ximcp/imTransR.c @@ -28,7 +28,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imTransR.c,v 3.4 2001/01/17 19:41:52 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imTransR.c,v 3.7 2003/11/17 22:20:12 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" @@ -50,7 +50,7 @@ Public TransportSW _XimTransportRec[] = { #ifdef STREAMSCONN { "streams", _XimTransConf }, /* use X transport lib */ #endif /* STREAMSCONN */ - { (char *)NULL, (Bool (*)())NULL }, + { (char *)NULL, (Bool (*)(Xim, char *))NULL }, }; Public Bool @@ -68,22 +68,15 @@ _XimShutdown(im) } Public Bool -#if NeedFunctionPrototypes _XimWrite(Xim im, INT16 len, XPointer data) -#else -_XimWrite(im, len, data) - Xim im; - INT16 len; - XPointer data; -#endif { return im->private.proto.write(im, len, data); } Private int -_CheckProtocolData(im, recv_buf) - Xim im; - char *recv_buf; +_CheckProtocolData( + Xim im, + char *recv_buf) { int data_len; @@ -92,11 +85,11 @@ _CheckProtocolData(im, recv_buf) } Private int -_XimReadData(im, len, buf, buf_size) - Xim im; - INT16 *len; - XPointer buf; - int buf_size; +_XimReadData( + Xim im, + INT16 *len, + XPointer buf, + int buf_size) { char *hold_buf; char *tmp; @@ -209,10 +202,10 @@ _XimReadData(im, len, buf, buf_size) } Private Bool -_XimCallDispatcher(im, len, data) - Xim im; - INT16 len; - XPointer data; +_XimCallDispatcher( + Xim im, + INT16 len, + XPointer data) { return im->private.proto.call_dispatcher(im, len, data); } @@ -224,9 +217,7 @@ _XimRead(im, len, buf, buf_size, predicate, arg) XPointer buf; int buf_size; Bool (*predicate)( -#if NeedNestedPrototypes Xim, INT16, XPointer, XPointer -#endif ); XPointer arg; { @@ -249,14 +240,12 @@ _XimRead(im, len, buf, buf_size, predicate, arg) } Public Bool -_XimRegisterDispatcher(im, callback, call_data) - Xim im; +_XimRegisterDispatcher( + Xim im, Bool (*callback)( -#if NeedNestedPrototypes Xim, INT16, XPointer, XPointer -#endif - ); - XPointer call_data; + ), + XPointer call_data) { return im->private.proto.register_dispatcher(im, callback, call_data); } |