diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:39 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:39 +0000 |
| commit | e096ac42209e3f383cd4e52cb4e2dff564bdbc8e (patch) | |
| tree | a88fdd134f3fb83dfa9fdd7c769d15aec8643efa /src/XGetKMap.c | |
| parent | 3d0889d2b8d326319e17ffc49e114892ef54f979 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
Diffstat (limited to 'src/XGetKMap.c')
| -rw-r--r-- | src/XGetKMap.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/XGetKMap.c b/src/XGetKMap.c index 3ea7819..fd14050 100644 --- a/src/XGetKMap.c +++ b/src/XGetKMap.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.5 2003/11/17 22:20:21 dawes Exp $ */ /*********************************************************************** * @@ -60,9 +60,8 @@ SOFTWARE. #include <X11/extensions/extutil.h> #include "XIint.h" -KeySym -#if NeedFunctionPrototypes -*XGetDeviceKeyMapping ( +KeySym * +XGetDeviceKeyMapping ( register Display *dpy, XDevice *dev, #if NeedWidePrototypes @@ -72,14 +71,6 @@ KeySym #endif int keycount, int *syms_per_code) -#else -*XGetDeviceKeyMapping (dpy, dev, first, keycount, syms_per_code) - register Display *dpy; - XDevice *dev; - KeyCode first; - int keycount; - int *syms_per_code; /* RETURN */ -#endif { long nbytes; register KeySym *mapping = NULL; |