summaryrefslogtreecommitdiff
path: root/src/XGetKMap.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:15 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:15 +0000
commit1b4f7c4f6dbbc62db74f433a73d129ae507642cd (patch)
treea88fdd134f3fb83dfa9fdd7c769d15aec8643efa /src/XGetKMap.c
parent3986f13c9319b4f64c7b2ec56391370735e7d51d (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_903_specialxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16xf86-012804-2330
Diffstat (limited to 'src/XGetKMap.c')
-rw-r--r--src/XGetKMap.c15
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;