summaryrefslogtreecommitdiff
path: root/modules/im/ximcp/imInt.c
diff options
context:
space:
mode:
Diffstat (limited to 'modules/im/ximcp/imInt.c')
-rw-r--r--modules/im/ximcp/imInt.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/modules/im/ximcp/imInt.c b/modules/im/ximcp/imInt.c
index b38abfb9..62b1a8ed 100644
--- a/modules/im/ximcp/imInt.c
+++ b/modules/im/ximcp/imInt.c
@@ -26,7 +26,7 @@ PERFORMANCE OF THIS SOFTWARE.
fujiwara@a80.tech.yk.fujitsu.co.jp
******************************************************************/
-/* $XFree86: xc/lib/X11/imInt.c,v 3.10 2001/11/16 00:52:27 dawes Exp $ */
+/* $XFree86: xc/lib/X11/imInt.c,v 3.13 2003/11/17 22:20:11 dawes Exp $ */
#include <X11/Xatom.h>
#include <X11/Xlib.h>
@@ -40,13 +40,8 @@ Private Xim *_XimCurrentIMlist = (Xim *)NULL;
Private int _XimCurrentIMcount = 0;
Private Bool
-#if NeedFunctionPrototypes
_XimSetIMStructureList(
Xim im)
-#else
-_XimSetIMStructureList(im)
- Xim im;
-#endif
{
register int i;
Xim *xim;
@@ -154,14 +149,9 @@ _XimServerReconectableDestroy()
#endif /* XIM_CONNECTABLE */
Private char *
-#if NeedFunctionPrototypes
_XimStrstr(
register char *src,
register char *dest)
-#else
-_XimStrstr(src, dest)
- register char *src, *dest;
-#endif
{
int len;
@@ -175,13 +165,8 @@ _XimStrstr(src, dest)
}
Private char *
-#if NeedFunctionPrototypes
_XimMakeImName(
XLCd lcd)
-#else
-_XimMakeImName(lcd)
- XLCd lcd;
-#endif
{
char* begin = NULL;
char* end = NULL;
@@ -210,20 +195,12 @@ _XimMakeImName(lcd)
}
Public XIM
-#if NeedFunctionPrototypes
_XimOpenIM(
XLCd lcd,
Display *dpy,
XrmDatabase rdb,
char *res_name,
char *res_class)
-#else
-_XimOpenIM(lcd, dpy, rdb, res_name, res_class)
- XLCd lcd;
- Display *dpy;
- XrmDatabase rdb;
- char *res_name, *res_class;
-#endif
{
Xim im;
register int i;