summaryrefslogtreecommitdiff
path: root/include/inputstr.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:01 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:01 +0000
commitadc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch)
tree23eb7becc5360b2cbe16aa8d45529880067f3989 /include/inputstr.h
parent90f1536dd315cd265bfc7ef35058761a65a01734 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'include/inputstr.h')
-rw-r--r--include/inputstr.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/include/inputstr.h b/include/inputstr.h
index 045e6a2de..a8a834807 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
/************************************************************
Copyright 1987, 1998 The Open Group
@@ -265,18 +265,12 @@ typedef struct _DeviceIntRec {
Bool fromPassiveGrab;
GrabRec activeGrab;
void (*ActivateGrab) (
-#if NeedNestedPrototypes
DeviceIntPtr /*device*/,
GrabPtr /*grab*/,
TimeStamp /*time*/,
- Bool /*autoGrab*/
-#endif
-);
+ Bool /*autoGrab*/);
void (*DeactivateGrab)(
-#if NeedNestedPrototypes
- DeviceIntPtr /*device*/
-#endif
-);
+ DeviceIntPtr /*device*/);
KeyClassPtr key;
ValuatorClassPtr valuator;
ButtonClassPtr button;