From f81d7ef72c9b4f13e33efa812bed9446657ed003 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Tue, 25 Nov 2003 19:28:16 +0000 Subject: XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks --- src/TMkey.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'src/TMkey.c') diff --git a/src/TMkey.c b/src/TMkey.c index 3087407..e338954 100644 --- a/src/TMkey.c +++ b/src/TMkey.c @@ -59,7 +59,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/TMkey.c,v 3.10 2001/12/14 19:56:30 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/TMkey.c,v 3.11 2003/04/21 16:34:28 herrb Exp $ */ #define XK_MISCELLANY #define XK_LATIN1 @@ -492,24 +492,12 @@ void _XtBuildKeysymTables(dpy,pd) XFreeModifiermap(modKeymap); } -#if NeedFunctionPrototypes void XtTranslateKeycode ( Display *dpy, _XtKeyCode keycode, Modifiers modifiers, Modifiers *modifiers_return, - KeySym *keysym_return - ) -#else -void XtTranslateKeycode (dpy, keycode, modifiers, - modifiers_return, keysym_return) - - Display *dpy; - KeyCode keycode; - Modifiers modifiers; - Modifiers *modifiers_return; - KeySym *keysym_return; -#endif + KeySym *keysym_return) { XtPerDisplay pd; DPY_TO_APPCON(dpy); @@ -523,23 +511,12 @@ void XtTranslateKeycode (dpy, keycode, modifiers, } /* This code should match XTranslateKey (internal, sigh) in Xlib */ -#if NeedFunctionPrototypes void XtTranslateKey( register Display *dpy, _XtKeyCode keycode, Modifiers modifiers, Modifiers *modifiers_return, - KeySym *keysym_return - ) -#else -void XtTranslateKey(dpy, keycode, modifiers, - modifiers_return, keysym_return) - register Display *dpy; - KeyCode keycode; - Modifiers modifiers; - Modifiers *modifiers_return; - KeySym *keysym_return; -#endif + KeySym *keysym_return) #ifndef XKB { XtPerDisplay pd; -- cgit v1.2.3