Merge branch 'uli42-pr/update_xi' into arctica-3.6.x

Attributes GH PR #644: https://github.com/ArcticaProject/nx-libs/pull/644

1 files changed, 48 insertions, 68 deletions

diff --git a/nx-X11/programs/Xserver/Xi/listdev.h b/nx-X11/programs/Xserver/Xi/listdev.h
index 629dca215..bdd67ce70 100644
--- a/nx-X11/programs/Xserver/Xi/listdev.h
+++ b/nx-X11/programs/Xserver/Xi/listdev.h
@@ -30,73 +30,53 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef LISTDEV_H
 #define LISTDEV_H 1
 
-int
-SProcXListInputDevices(
-	ClientPtr              /* client */
-	);
-
-int
-ProcXListInputDevices (
-	ClientPtr              /* client */
-	);
-
-void
-SizeDeviceInfo (
-	DeviceIntPtr           /* d */,
-	int *                  /* namesize */,
-	int *                  /* size */
-	);
-
-void
-ListDeviceInfo (
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* d */,
-	xDeviceInfoPtr         /* dev */,
-	char **                /* devbuf */,
-	char **                /* classbuf */,
-	char **                /* namebuf */
-	);
-
-void
-CopyDeviceName (
-	char **                /* namebuf */,
-	char *                 /* name */
-	);
-
-void
-CopySwapDevice (
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* d */,
-	int                    /* num_classes */,
-	char **                /* buf */
-	);
-
-void
-CopySwapKeyClass (
-	ClientPtr              /* client */,
-	KeyClassPtr            /* k */,
-	char **                /* buf */
-	);
-
-void
-CopySwapButtonClass (
-	ClientPtr              /* client */,
-	ButtonClassPtr         /* b */,
-	char **                /* buf */
-	);
-
-int
-CopySwapValuatorClass (
-	ClientPtr              /* client */,
-	ValuatorClassPtr       /* v */,
-	char **                /* buf */
-	);
-
-void
-SRepXListInputDevices (
-	ClientPtr              /* client */,
-	int                    /* size */,
-	xListInputDevicesReply * /* rep */
-	);
+int SProcXListInputDevices(ClientPtr	/* client */
+    );
+
+int ProcXListInputDevices(ClientPtr	/* client */
+    );
+
+void SizeDeviceInfo(DeviceIntPtr /* d */ ,
+		    int * /* namesize */ ,
+		    int *	/* size */
+    );
+
+void ListDeviceInfo(ClientPtr /* client */ ,
+		    DeviceIntPtr /* d */ ,
+		    xDeviceInfoPtr /* dev */ ,
+		    char ** /* devbuf */ ,
+		    char ** /* classbuf */ ,
+		    char **	/* namebuf */
+    );
+
+void CopyDeviceName(char ** /* namebuf */ ,
+		    char *	/* name */
+    );
+
+void CopySwapDevice(ClientPtr /* client */ ,
+		    DeviceIntPtr /* d */ ,
+		    int /* num_classes */ ,
+		    char **	/* buf */
+    );
+
+void CopySwapKeyClass(ClientPtr /* client */ ,
+		      KeyClassPtr /* k */ ,
+		      char **	/* buf */
+    );
+
+void CopySwapButtonClass(ClientPtr /* client */ ,
+			 ButtonClassPtr /* b */ ,
+			 char **	/* buf */
+    );
+
+int CopySwapValuatorClass(ClientPtr /* client */ ,
+			  ValuatorClassPtr /* v */ ,
+			  char **	/* buf */
+    );
+
+void SRepXListInputDevices(ClientPtr /* client */ ,
+			   int /* size */ ,
+			   xListInputDevicesReply *	/* rep */
+    );
 
 #endif /* LISTDEV_H */