summaryrefslogtreecommitdiff
path: root/Xi
diff options
context:
space:
mode:
Diffstat (limited to 'Xi')
-rw-r--r--Xi/allowev.h6
-rw-r--r--Xi/chgdctl.h8
-rw-r--r--Xi/chgfctl.h18
-rw-r--r--Xi/chgkbd.h8
-rw-r--r--Xi/chgkmap.h6
-rw-r--r--Xi/chgprop.h6
-rw-r--r--Xi/chgptr.h14
-rw-r--r--Xi/closedev.h10
-rw-r--r--Xi/devbell.h6
-rw-r--r--Xi/exevents.c77
-rw-r--r--Xi/extinit.c7
-rw-r--r--Xi/getbmap.h8
-rw-r--r--Xi/getdctl.h10
-rw-r--r--Xi/getfctl.h20
-rw-r--r--Xi/getfocus.h8
-rw-r--r--Xi/getkmap.h8
-rw-r--r--Xi/getmmap.h8
-rw-r--r--Xi/getprop.h10
-rw-r--r--Xi/getselev.h8
-rw-r--r--Xi/getvers.h8
-rw-r--r--Xi/grabdev.h10
-rw-r--r--Xi/grabdevb.h6
-rw-r--r--Xi/grabdevk.h6
-rw-r--r--Xi/gtmotion.h8
-rw-r--r--Xi/listdev.h22
-rw-r--r--Xi/opendev.h8
-rw-r--r--Xi/queryst.h8
-rw-r--r--Xi/selectev.h6
-rw-r--r--Xi/sendexev.h6
-rw-r--r--Xi/setbmap.h8
-rw-r--r--Xi/setdval.h8
-rw-r--r--Xi/setfocus.h6
-rw-r--r--Xi/setmmap.h8
-rw-r--r--Xi/setmode.h8
-rw-r--r--Xi/stubs.c8
-rw-r--r--Xi/ungrdev.h6
-rw-r--r--Xi/ungrdevb.h6
-rw-r--r--Xi/ungrdevk.h6
38 files changed, 38 insertions, 360 deletions
diff --git a/Xi/allowev.h b/Xi/allowev.h
index 950824927..0202b2cf5 100644
--- a/Xi/allowev.h
+++ b/Xi/allowev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.1 1996/04/15 11:18:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXAllowDeviceEvents(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXAllowDeviceEvents(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
#endif /* ALLOWEV_H */
diff --git a/Xi/chgdctl.h b/Xi/chgdctl.h
index 4d245388d..0d15001a0 100644
--- a/Xi/chgdctl.h
+++ b/Xi/chgdctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.1 1996/04/15 11:18:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXChangeDeviceControl(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXChangeDeviceControl(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXChangeDeviceControl (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xChangeDeviceControlReply * /* rep */
-#endif
);
#endif /* CHGDCTL_H */
diff --git a/Xi/chgfctl.h b/Xi/chgfctl.h
index ebf41976c..4f833617a 100644
--- a/Xi/chgfctl.h
+++ b/Xi/chgfctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.1 1996/04/15 11:18:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,82 +29,66 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXChangeFeedbackControl(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXChangeFeedbackControl(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ChangeKbdFeedback (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
KbdFeedbackPtr /* k */,
xKbdFeedbackCtl * /* f */
-#endif
);
int
ChangePtrFeedback (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
PtrFeedbackPtr /* p */,
xPtrFeedbackCtl * /* f */
-#endif
);
int
ChangeIntegerFeedback (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
IntegerFeedbackPtr /* i */,
xIntegerFeedbackCtl * /* f */
-#endif
);
int
ChangeStringFeedback (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
StringFeedbackPtr /* s */,
xStringFeedbackCtl * /* f */
-#endif
);
int
ChangeBellFeedback (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
BellFeedbackPtr /* b */,
xBellFeedbackCtl * /* f */
-#endif
);
int
ChangeLedFeedback (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
LedFeedbackPtr /* l */,
xLedFeedbackCtl * /* f */
-#endif
);
#endif /* CHGFCTL_H */
diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h
index 98b95a6b0..5a2cef2c7 100644
--- a/Xi/chgkbd.h
+++ b/Xi/chgkbd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.1 1996/04/15 11:18:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXChangeKeyboardDevice(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXChangeKeyboardDevice (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXChangeKeyboardDevice (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xChangeKeyboardDeviceReply * /* rep */
-#endif
);
diff --git a/Xi/chgkmap.h b/Xi/chgkmap.h
index fa7035988..fd7ed4673 100644
--- a/Xi/chgkmap.h
+++ b/Xi/chgkmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.1 1996/04/15 11:18:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXChangeDeviceKeyMapping(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXChangeDeviceKeyMapping(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
#endif /* CHGKMAP_H */
diff --git a/Xi/chgprop.h b/Xi/chgprop.h
index a72c6f036..9df05b4d0 100644
--- a/Xi/chgprop.h
+++ b/Xi/chgprop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.1 1996/04/15 11:18:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXChangeDeviceDontPropagateList (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXChangeDeviceDontPropagateList (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
#endif /* CHGPROP_H */
diff --git a/Xi/chgptr.h b/Xi/chgptr.h
index 93f5822fc..3168e9710 100644
--- a/Xi/chgptr.h
+++ b/Xi/chgptr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.1 1996/04/15 11:18:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,53 +29,41 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXChangePointerDevice(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXChangePointerDevice (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
DeleteFocusClassDeviceStruct(
-#if NeedFunctionPrototypes
DeviceIntPtr /* dev */
-#endif
);
void
SendEventToAllWindows (
-#if NeedFunctionPrototypes
DeviceIntPtr /* dev */,
Mask /* mask */,
xEvent * /* ev */,
int /* count */
-#endif
);
void
FindInterestedChildren ( /* FIXME: could be static? */
-#if NeedFunctionPrototypes
DeviceIntPtr /* dev */,
WindowPtr /* p1 */,
Mask /* mask */,
xEvent * /* ev */,
int /* count */
-#endif
);
void
SRepXChangePointerDevice (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xChangePointerDeviceReply * /* rep */
-#endif
);
#endif /* CHGPTR_H */
diff --git a/Xi/closedev.h b/Xi/closedev.h
index f71336e96..0295b2c8f 100644
--- a/Xi/closedev.h
+++ b/Xi/closedev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,34 +29,26 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXCloseDevice(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXCloseDevice(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
DeleteEventsFromChildren(
-#if NeedFunctionPrototypes
DeviceIntPtr /* dev */,
WindowPtr /* p1 */,
ClientPtr /* client */
-#endif
);
void
DeleteDeviceEvents (
-#if NeedFunctionPrototypes
DeviceIntPtr /* dev */,
WindowPtr /* pWin */,
ClientPtr /* client */
-#endif
);
#endif /* CLOSEDEV_H */
diff --git a/Xi/devbell.h b/Xi/devbell.h
index cccb31de9..bbf6dea92 100644
--- a/Xi/devbell.h
+++ b/Xi/devbell.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXDeviceBell (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXDeviceBell (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
#endif /* DEVBELL_H */
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 76a693e6c..d2b2fb58c 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.10 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.11 2003/11/17 22:20:29 dawes Exp $ */
/********************************************************************
*
@@ -82,15 +82,11 @@ SOFTWARE.
(class)->state | (class)->motionMask)
static Bool ShouldFreeInputMasks(
-#if NeedFunctionPrototypes
WindowPtr /* pWin */,
Bool /* ignoreSelectedEvents */
-#endif
);
static Bool MakeInputMasks (
-#if NeedFunctionPrototypes
WindowPtr /* pWin */
-#endif
);
/**************************************************************************
@@ -328,7 +324,6 @@ InitValuatorAxisStruct( DeviceIntPtr dev,
}
static void
-#if NeedFunctionPrototypes
FixDeviceStateNotify (
DeviceIntPtr dev,
deviceStateNotify *ev,
@@ -336,15 +331,6 @@ FixDeviceStateNotify (
ButtonClassPtr b,
ValuatorClassPtr v,
int first)
-#else
-FixDeviceStateNotify (dev, ev, k, b, v, first)
- DeviceIntPtr dev;
- deviceStateNotify *ev;
- KeyClassPtr k;
- ButtonClassPtr b;
- ValuatorClassPtr v;
- int first;
-#endif
{
ev->type = DeviceStateNotify;
ev->deviceid = dev->id;
@@ -383,19 +369,11 @@ FixDeviceStateNotify (dev, ev, k, b, v, first)
}
static void
-#if NeedFunctionPrototypes
FixDeviceValuator (
DeviceIntPtr dev,
deviceValuator *ev,
ValuatorClassPtr v,
int first)
-#else
-FixDeviceValuator (dev, ev, v, first)
- DeviceIntPtr dev;
- deviceValuator *ev;
- ValuatorClassPtr v;
- int first;
-#endif
{
int nval = v->numAxes - first;
@@ -538,7 +516,6 @@ DeviceFocusEvent(dev, type, mode, detail, pWin)
}
int
-#if NeedFunctionPrototypes
GrabButton(
ClientPtr client,
DeviceIntPtr dev,
@@ -552,23 +529,6 @@ GrabButton(
Cursor rcursor,
Window rconfineTo,
Mask eventMask)
-#else
-GrabButton(client, dev, this_device_mode, other_devices_mode, modifiers,
- modifier_device, button, grabWindow, ownerEvents, rcursor, rconfineTo,
- eventMask)
- ClientPtr client;
- DeviceIntPtr dev;
- BYTE this_device_mode;
- BYTE other_devices_mode;
- CARD16 modifiers;
- DeviceIntPtr modifier_device;
- CARD8 button;
- Window grabWindow;
- BOOL ownerEvents;
- Cursor rcursor;
- Window rconfineTo;
- Mask eventMask;
-#endif
{
WindowPtr pWin, confineTo;
CursorPtr cursor;
@@ -630,7 +590,6 @@ GrabButton(client, dev, this_device_mode, other_devices_mode, modifiers,
}
int
-#if NeedFunctionPrototypes
GrabKey(
ClientPtr client,
DeviceIntPtr dev,
@@ -642,20 +601,6 @@ GrabKey(
Window grabWindow,
BOOL ownerEvents,
Mask mask)
-#else
-GrabKey(client, dev, this_device_mode, other_devices_mode, modifiers,
- modifier_device, key, grabWindow, ownerEvents, mask)
- ClientPtr client;
- DeviceIntPtr dev;
- BYTE this_device_mode;
- BYTE other_devices_mode;
- CARD16 modifiers;
- DeviceIntPtr modifier_device;
- CARD8 key;
- Window grabWindow;
- BOOL ownerEvents;
- Mask mask;
-#endif
{
WindowPtr pWin;
GrabPtr grab;
@@ -1102,18 +1047,11 @@ SetModifierMapping(client, dev, len, rlen, numKeyPerModifier, inputMap, k)
}
void
-#if NeedFunctionPrototypes
SendDeviceMappingNotify(
CARD8 request,
KeyCode firstKeyCode,
CARD8 count,
DeviceIntPtr dev)
-#else
-SendDeviceMappingNotify(request, firstKeyCode, count, dev)
- CARD8 request, count;
- KeyCode firstKeyCode;
- DeviceIntPtr dev;
-#endif
{
xEvent event;
deviceMappingNotify *ev = (deviceMappingNotify *) &event;
@@ -1132,7 +1070,6 @@ SendDeviceMappingNotify(request, firstKeyCode, count, dev)
}
int
-#if NeedFunctionPrototypes
ChangeKeyMapping(
ClientPtr client,
DeviceIntPtr dev,
@@ -1142,18 +1079,6 @@ ChangeKeyMapping(
CARD8 keyCodes,
CARD8 keySymsPerKeyCode,
KeySym *map)
-#else
-ChangeKeyMapping(client, dev, len, type, firstKeyCode, keyCodes,
- keySymsPerKeyCode, map)
- ClientPtr client;
- DeviceIntPtr dev;
- unsigned len;
- int type;
- KeyCode firstKeyCode;
- CARD8 keyCodes;
- CARD8 keySymsPerKeyCode;
- KeySym *map;
-#endif
{
KeySymsRec keysyms;
KeyClassPtr k = dev->key;
diff --git a/Xi/extinit.c b/Xi/extinit.c
index ce5d96c8a..01d51ba64 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.6 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.7 2003/11/17 22:20:29 dawes Exp $ */
/********************************************************************
*
@@ -894,13 +894,8 @@ MakeDeviceTypeAtoms ()
*/
DeviceIntPtr
-#if NeedFunctionPrototypes
LookupDeviceIntRec (
CARD8 id)
-#else
-LookupDeviceIntRec (id)
- CARD8 id;
-#endif
{
DeviceIntPtr dev;
diff --git a/Xi/getbmap.h b/Xi/getbmap.h
index 30de6f5c6..999a7c9f9 100644
--- a/Xi/getbmap.h
+++ b/Xi/getbmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.1 1996/04/15 11:18:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceButtonMapping(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXGetDeviceButtonMapping (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXGetDeviceButtonMapping (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceButtonMappingReply * /* rep */
-#endif
);
#endif /* GETBMAP_H */
diff --git a/Xi/getdctl.h b/Xi/getdctl.h
index d22675f4f..0318b4387 100644
--- a/Xi/getdctl.h
+++ b/Xi/getdctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.1 1996/04/15 11:18:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,35 +29,27 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceControl (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXGetDeviceControl (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
CopySwapDeviceResolution (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
ValuatorClassPtr /* v */,
char * /* buf */,
int /* length */
-#endif
);
void
SRepXGetDeviceControl (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceControlReply * /* rep */
-#endif
);
#endif /* GETDCTL_H */
diff --git a/Xi/getfctl.h b/Xi/getfctl.h
index e51830d49..6ba96b066 100644
--- a/Xi/getfctl.h
+++ b/Xi/getfctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.1 1996/04/15 11:18:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,79 +29,61 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetFeedbackControl(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXGetFeedbackControl(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
CopySwapKbdFeedback (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
KbdFeedbackPtr /* k */,
char ** /* buf */
-#endif
);
void
CopySwapPtrFeedback (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
PtrFeedbackPtr /* p */,
char ** /* buf */
-#endif
);
void
CopySwapIntegerFeedback (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
IntegerFeedbackPtr /* i */,
char ** /* buf */
-#endif
);
void
CopySwapStringFeedback (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
StringFeedbackPtr /* s */,
char ** /* buf */
-#endif
);
void
CopySwapLedFeedback (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
LedFeedbackPtr /* l */,
char ** /* buf */
-#endif
);
void
CopySwapBellFeedback (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
BellFeedbackPtr /* b */,
char ** /* buf */
-#endif
);
void
SRepXGetFeedbackControl (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetFeedbackControlReply * /* rep */
-#endif
);
#endif /* GETFCTL_H */
diff --git a/Xi/getfocus.h b/Xi/getfocus.h
index 8a21c860c..d3df5ba5f 100644
--- a/Xi/getfocus.h
+++ b/Xi/getfocus.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.1 1996/04/15 11:18:40 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceFocus(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXGetDeviceFocus(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXGetDeviceFocus (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceFocusReply * /* rep */
-#endif
);
#endif /* GETFOCUS_H */
diff --git a/Xi/getkmap.h b/Xi/getkmap.h
index 780a2e016..ebd02f3ef 100644
--- a/Xi/getkmap.h
+++ b/Xi/getkmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.1 1996/04/15 11:18:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceKeyMapping(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXGetDeviceKeyMapping(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXGetDeviceKeyMapping (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceKeyMappingReply * /* rep */
-#endif
);
#endif /* GETKMAP_H */
diff --git a/Xi/getmmap.h b/Xi/getmmap.h
index cf9ca000d..ff317e0c4 100644
--- a/Xi/getmmap.h
+++ b/Xi/getmmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.1 1996/04/15 11:18:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceModifierMapping(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXGetDeviceModifierMapping(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXGetDeviceModifierMapping (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceModifierMappingReply * /* rep */
-#endif
);
#endif /* GETMMAP_H */
diff --git a/Xi/getprop.h b/Xi/getprop.h
index 4f467e041..452875bd9 100644
--- a/Xi/getprop.h
+++ b/Xi/getprop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.1 1996/04/15 11:18:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,36 +29,28 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceDontPropagateList(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXGetDeviceDontPropagateList (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
XEventClass *
ClassFromMask (
-#if NeedFunctionPrototypes
XEventClass * /* buf */,
Mask /* mask */,
int /* maskndx */,
CARD16 * /* count */,
int /* mode */
-#endif
);
void
SRepXGetDeviceDontPropagateList (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceDontPropagateListReply * /* rep */
-#endif
);
#endif /* GETPROP_H */
diff --git a/Xi/getselev.h b/Xi/getselev.h
index 0d4e6a467..5ed759c29 100644
--- a/Xi/getselev.h
+++ b/Xi/getselev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.1 1996/04/15 11:18:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetSelectedExtensionEvents(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXGetSelectedExtensionEvents(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXGetSelectedExtensionEvents (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetSelectedExtensionEventsReply * /* rep */
-#endif
);
#endif /* GETSELEV_H */
diff --git a/Xi/getvers.h b/Xi/getvers.h
index 1646633e9..2304c6639 100644
--- a/Xi/getvers.h
+++ b/Xi/getvers.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.1 1996/04/15 11:18:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetExtensionVersion(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXGetExtensionVersion (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXGetExtensionVersion (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetExtensionVersionReply * /* rep */
-#endif
);
#endif /* GETVERS_H */
diff --git a/Xi/grabdev.h b/Xi/grabdev.h
index 382e06b99..1eddd24ac 100644
--- a/Xi/grabdev.h
+++ b/Xi/grabdev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.1 1996/04/15 11:18:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,37 +29,29 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGrabDevice(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXGrabDevice(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
CreateMaskFromList (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
XEventClass * /* list */,
int /* count */,
struct tmask /* mask */[],
DeviceIntPtr /* dev */,
int /* req */
-#endif
);
void
SRepXGrabDevice (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGrabDeviceReply * /* rep */
-#endif
);
#endif /* GRABDEV_H */
diff --git a/Xi/grabdevb.h b/Xi/grabdevb.h
index 39b96bcf1..8782c12ac 100644
--- a/Xi/grabdevb.h
+++ b/Xi/grabdevb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.1 1996/04/15 11:18:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGrabDeviceButton(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXGrabDeviceButton(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
#endif /* GRABDEVB_H */
diff --git a/Xi/grabdevk.h b/Xi/grabdevk.h
index 7e533fe16..eb8db9511 100644
--- a/Xi/grabdevk.h
+++ b/Xi/grabdevk.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.1 1996/04/15 11:18:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGrabDeviceKey(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXGrabDeviceKey(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
#endif /* GRABDEVK_H */
diff --git a/Xi/gtmotion.h b/Xi/gtmotion.h
index 1139a1a76..7d85e566e 100644
--- a/Xi/gtmotion.h
+++ b/Xi/gtmotion.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.1 1996/04/15 11:18:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceMotionEvents(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXGetDeviceMotionEvents(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXGetDeviceMotionEvents (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceMotionEventsReply * /* rep */
-#endif
);
#endif /* GTMOTION_H */
diff --git a/Xi/listdev.h b/Xi/listdev.h
index d1ecde2ab..c9553b692 100644
--- a/Xi/listdev.h
+++ b/Xi/listdev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.1 1996/04/15 11:18:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,91 +29,71 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXListInputDevices(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXListInputDevices (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SizeDeviceInfo (
-#if NeedFunctionPrototypes
DeviceIntPtr /* d */,
int * /* namesize */,
int * /* size */
-#endif
);
void
ListDeviceInfo (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* d */,
xDeviceInfoPtr /* dev */,
char ** /* devbuf */,
char ** /* classbuf */,
char ** /* namebuf */
-#endif
);
void
CopyDeviceName (
-#if NeedFunctionPrototypes
char ** /* namebuf */,
char * /* name */
-#endif
);
void
CopySwapDevice (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* d */,
int /* num_classes */,
char ** /* buf */
-#endif
);
void
CopySwapKeyClass (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
KeyClassPtr /* k */,
char ** /* buf */
-#endif
);
void
CopySwapButtonClass (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
ButtonClassPtr /* b */,
char ** /* buf */
-#endif
);
int
CopySwapValuatorClass (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
ValuatorClassPtr /* v */,
char ** /* buf */
-#endif
);
void
SRepXListInputDevices (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xListInputDevicesReply * /* rep */
-#endif
);
#endif /* LISTDEV_H */
diff --git a/Xi/opendev.h b/Xi/opendev.h
index 0813e59ad..818e2d877 100644
--- a/Xi/opendev.h
+++ b/Xi/opendev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.1 1996/04/15 11:18:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXOpenDevice(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXOpenDevice(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXOpenDevice (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xOpenDeviceReply * /* rep */
-#endif
);
#endif /* OPENDEV_H */
diff --git a/Xi/queryst.h b/Xi/queryst.h
index 6d6b4b65b..50d36e95e 100644
--- a/Xi/queryst.h
+++ b/Xi/queryst.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.1 1996/04/15 11:19:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXQueryDeviceState(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXQueryDeviceState(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXQueryDeviceState (
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xQueryDeviceStateReply * /* rep */
-#endif
);
#endif /* QUERYST_H */
diff --git a/Xi/selectev.h b/Xi/selectev.h
index 79332e199..2327b94c5 100644
--- a/Xi/selectev.h
+++ b/Xi/selectev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.1 1996/04/15 11:19:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSelectExtensionEvent (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXSelectExtensionEvent (
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
#endif /* SELECTEV_H */
diff --git a/Xi/sendexev.h b/Xi/sendexev.h
index 876bbe647..c2ace5804 100644
--- a/Xi/sendexev.h
+++ b/Xi/sendexev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.1 1996/04/15 11:19:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSendExtensionEvent(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXSendExtensionEvent(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
#endif /* SENDEXEV_H */
diff --git a/Xi/setbmap.h b/Xi/setbmap.h
index 3e85c0a58..77f097104 100644
--- a/Xi/setbmap.h
+++ b/Xi/setbmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.1 1996/04/15 11:19:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSetDeviceButtonMapping(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXSetDeviceButtonMapping(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXSetDeviceButtonMapping(
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xSetDeviceButtonMappingReply * /* rep */
-#endif
);
#endif /* SETBMAP_H */
diff --git a/Xi/setdval.h b/Xi/setdval.h
index 5a8b42192..e6f08a64c 100644
--- a/Xi/setdval.h
+++ b/Xi/setdval.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.1 1996/04/15 11:19:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSetDeviceValuators(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXSetDeviceValuators(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXSetDeviceValuators(
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xSetDeviceValuatorsReply * /* rep */
-#endif
);
#endif /* SETDVAL_H */
diff --git a/Xi/setfocus.h b/Xi/setfocus.h
index 44a98193a..1da6927b4 100644
--- a/Xi/setfocus.h
+++ b/Xi/setfocus.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.1 1996/04/15 11:19:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSetDeviceFocus(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXSetDeviceFocus(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
#endif /* SETFOCUS_H */
diff --git a/Xi/setmmap.h b/Xi/setmmap.h
index 925373e9e..30fb57b48 100644
--- a/Xi/setmmap.h
+++ b/Xi/setmmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.1 1996/04/15 11:19:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSetDeviceModifierMapping(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXSetDeviceModifierMapping(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXSetDeviceModifierMapping(
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xSetDeviceModifierMappingReply * /* rep */
-#endif
);
#endif /* SETMMAP_H */
diff --git a/Xi/setmode.h b/Xi/setmode.h
index cd27ba146..63a1dd35b 100644
--- a/Xi/setmode.h
+++ b/Xi/setmode.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.1 1996/04/15 11:19:07 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSetDeviceMode(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXSetDeviceMode(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
void
SRepXSetDeviceMode(
-#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xSetDeviceModeReply * /* rep */
-#endif
);
#endif /* SETMODE_H */
diff --git a/Xi/stubs.c b/Xi/stubs.c
index 991f8b433..879d8e9b7 100644
--- a/Xi/stubs.c
+++ b/Xi/stubs.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.4 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.5 2003/11/17 22:20:30 dawes Exp $ */
/*
* stubs.c -- stub routines for the X server side of the XINPUT
@@ -132,17 +132,11 @@ ChangeKeyboardDevice (old_dev, new_dev)
*/
int
-#if NeedFunctionPrototypes
ChangePointerDevice (
DeviceIntPtr old_dev,
DeviceIntPtr new_dev,
unsigned char x,
unsigned char y)
-#else
-ChangePointerDevice (old_dev, new_dev, x, y)
- DeviceIntPtr old_dev, new_dev;
- unsigned char x, y;
-#endif
{
/***********************************************************************
InitFocusClassDeviceStruct(old_dev); * allow focusing old ptr*
diff --git a/Xi/ungrdev.h b/Xi/ungrdev.h
index 6b00a3ef6..9a036901f 100644
--- a/Xi/ungrdev.h
+++ b/Xi/ungrdev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/ungrdev.h,v 3.1 1996/04/15 11:19:08 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/ungrdev.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXUngrabDevice(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXUngrabDevice(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
#endif /* UNGRDEV_H */
diff --git a/Xi/ungrdevb.h b/Xi/ungrdevb.h
index d416c73c6..500b77ebb 100644
--- a/Xi/ungrdevb.h
+++ b/Xi/ungrdevb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.h,v 3.1 1996/04/15 11:19:10 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXUngrabDeviceButton(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXUngrabDeviceButton(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
#endif /* UNGRDEVB_H */
diff --git a/Xi/ungrdevk.h b/Xi/ungrdevk.h
index 26dc14ae0..c43575ba1 100644
--- a/Xi/ungrdevk.h
+++ b/Xi/ungrdevk.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.h,v 3.1 1996/04/15 11:19:12 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXUngrabDeviceKey(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
int
ProcXUngrabDeviceKey(
-#if NeedFunctionPrototypes
ClientPtr /* client */
-#endif
);
#endif /* UNGRDEVK_H */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 01:52:17 +0000