Merge branch 'master' into mpx

1 files changed, 83 insertions, 32 deletions

diff --git a/src/XExtInt.c b/src/XExtInt.c
index 2809f74..5052b7f 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -69,12 +69,64 @@ SOFTWARE.
 #define ENQUEUE_EVENT	True
 #define DONT_ENQUEUE	False
 
+extern void _xibaddevice(
+    Display *		/* dpy */,
+    int *		/* error */
+);
+
+extern void _xibadclass(
+    Display *		/* dpy */,
+    int *		/* error */
+);
+
+extern void _xibadevent(
+    Display *		/* dpy */,
+    int *		/* error */
+);
+
+extern void _xibadmode(
+    Display *		/* dpy */,
+    int *		/* error */
+);
+
+extern void _xidevicebusy(
+    Display *		/* dpy */,
+    int *		/* error */
+);
+
+extern int _XiGetDevicePresenceNotifyEvent(
+    Display *		/* dpy */
+);
+
 static XExtensionInfo *xinput_info;
 static /* const */ char *xinput_extension_name = INAME;
-static int XInputClose();
-static char *XInputError();
-static Bool XInputWireToEvent();
-Status _XiEventToWire();
+
+static int XInputClose(
+    Display *		/* dpy */,
+    XExtCodes *		/* codes */
+);
+
+static char *XInputError(
+    Display *		/* dpy */,
+    int			/* code */,
+    XExtCodes *		/* codes */,
+    char *		/* buf */,
+    int			/* n */
+);
+
+static Bool XInputWireToEvent(
+    Display *		/* dpy */,
+    XEvent *		/* re */,
+    xEvent *		/* event */
+);
+
+Status _XiEventToWire(
+    register Display *	/* dpy */,
+    register XEvent *	/* re */,
+    register xEvent **	/* event */,
+    register int *	/* count */
+);
+
 static /* const */ XEvent emptyevent;
 
 /* ge events handling */
@@ -139,9 +191,9 @@ static XExtensionVersion versions[] = { {XI_Absent, 0, 0},
  */
 
 void
-_xibaddevice(dpy, error)
-    Display *dpy;
-    int *error;
+_xibaddevice(
+    Display	*dpy,
+    int		*error)
 {
     XExtDisplayInfo *info = XInput_find_display(dpy);
 
@@ -149,9 +201,9 @@ _xibaddevice(dpy, error)
 }
 
 void
-_xibadclass(dpy, error)
-    Display *dpy;
-    int *error;
+_xibadclass(
+    Display	*dpy,
+    int		*error)
 {
     XExtDisplayInfo *info = XInput_find_display(dpy);
 
@@ -159,9 +211,9 @@ _xibadclass(dpy, error)
 }
 
 void
-_xibadevent(dpy, error)
-    Display *dpy;
-    int *error;
+_xibadevent(
+    Display	*dpy,
+    int		*error)
 {
     XExtDisplayInfo *info = XInput_find_display(dpy);
 
@@ -169,9 +221,9 @@ _xibadevent(dpy, error)
 }
 
 void
-_xibadmode(dpy, error)
-    Display *dpy;
-    int *error;
+_xibadmode(
+    Display	*dpy,
+    int		*error)
 {
     XExtDisplayInfo *info = XInput_find_display(dpy);
 
@@ -179,9 +231,9 @@ _xibadmode(dpy, error)
 }
 
 void
-_xidevicebusy(dpy, error)
-    Display *dpy;
-    int *error;
+_xidevicebusy(
+    Display	*dpy,
+    int		*error)
 {
     XExtDisplayInfo *info = XInput_find_display(dpy);
 
@@ -202,10 +254,10 @@ static int XInputCheckExtension(Display *dpy, XExtDisplayInfo *info)
  */
 
 int
-_XiCheckExtInit(dpy, version_index, info)
-    register Display *dpy;
-    register int version_index;
-    XExtDisplayInfo *info;
+_XiCheckExtInit(
+    register Display	*dpy,
+    register int	 version_index,
+    XExtDisplayInfo	*info)
 {
     XExtensionVersion *ext;
 
@@ -246,9 +298,9 @@ _XiCheckExtInit(dpy, version_index, info)
  */
 
 static int
-XInputClose(dpy, codes)
-    Display *dpy;
-    XExtCodes *codes;
+XInputClose(
+    Display	*dpy,
+    XExtCodes	*codes)
 {
     XExtDisplayInfo *info = XInput_find_display(dpy);
 
@@ -260,8 +312,7 @@ XInputClose(dpy, codes)
 }
 
 static int
-Ones(mask)
-    Mask mask;
+Ones(Mask mask)
 {
     register Mask y;
 
@@ -286,10 +337,10 @@ _XiGetDevicePresenceNotifyEvent(Display * dpy)
  */
 
 static Bool
-XInputWireToEvent(dpy, re, event)
-    Display *dpy;
-    XEvent *re;
-    xEvent *event;
+XInputWireToEvent(
+    Display	*dpy,
+    XEvent	*re,
+    xEvent	*event)
 {
     unsigned int type, reltype;
     unsigned int i, j;