Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x

Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.

1 files changed, 125 insertions, 95 deletions

diff --git a/nx-X11/lib/X11/Macros.c b/nx-X11/lib/X11/Macros.c
index acf44ae7a..cfc083a01 100644
--- a/nx-X11/lib/X11/Macros.c
+++ b/nx-X11/lib/X11/Macros.c
@@ -37,151 +37,182 @@ in this Software without prior written authorization from The Open Group.
  * need them.
  */
 
-int XConnectionNumber(dpy) Display *dpy; { return (ConnectionNumber(dpy)); }
+int XConnectionNumber(Display *dpy) { return (ConnectionNumber(dpy)); }
 
-Window XRootWindow (dpy, scr)
-    Display *dpy; int scr;
-	{	return (RootWindow(dpy,scr));	}
+Window XRootWindow (Display *dpy, int scr)
+{
+    return (RootWindow(dpy,scr));
+}
 
-int XDefaultScreen(dpy) Display *dpy; { return (DefaultScreen(dpy)); }
+int XDefaultScreen(Display *dpy) { return (DefaultScreen(dpy)); }
 
-Window XDefaultRootWindow (dpy)
-    Display *dpy;
-	{	return (RootWindow(dpy,DefaultScreen(dpy)));	}
+Window XDefaultRootWindow (Display *dpy)
+{
+    return (RootWindow(dpy,DefaultScreen(dpy)));
+}
 
-Visual *XDefaultVisual(dpy, scr)
-    Display *dpy; int scr;
-	{	return (DefaultVisual(dpy, scr)); }
+Visual *XDefaultVisual(Display *dpy, int scr)
+{
+    return (DefaultVisual(dpy, scr));
+}
 
-GC XDefaultGC(dpy, scr)
-    Display *dpy; int scr;
-	{	return (DefaultGC(dpy,scr)); }
+GC XDefaultGC(Display *dpy, int scr)
+{
+    return (DefaultGC(dpy,scr));
+}
 
-unsigned long XBlackPixel(dpy, scr)
-    Display *dpy; int scr; 
-	{	return (BlackPixel(dpy, scr)); }
+unsigned long XBlackPixel(Display *dpy, int scr)
+{
+    return (BlackPixel(dpy, scr));
+}
 
-unsigned long XWhitePixel(dpy, scr)
-    Display *dpy; int scr; 
-	{	return (WhitePixel(dpy,scr)); }
+unsigned long XWhitePixel(Display *dpy, int scr)
+{
+    return (WhitePixel(dpy,scr));
+}
 
-unsigned long XAllPlanes() { return AllPlanes; }
+unsigned long XAllPlanes(void) { return AllPlanes; }
 
-int XQLength(dpy) Display *dpy; { return (QLength(dpy)); }
+int XQLength(Display *dpy) { return (QLength(dpy)); }
 
-int XDisplayWidth(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DisplayWidth(dpy,scr)); }
+int XDisplayWidth(Display *dpy, int scr)
+{
+    return (DisplayWidth(dpy,scr));
+}
 
-int XDisplayHeight(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DisplayHeight(dpy, scr)); }
+int XDisplayHeight(Display *dpy, int scr)
+{
+    return (DisplayHeight(dpy, scr));
+}
 
-int XDisplayWidthMM(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DisplayWidthMM(dpy, scr)); }
+int XDisplayWidthMM(Display *dpy, int scr)
+{
+    return (DisplayWidthMM(dpy, scr));
+}
 
-int XDisplayHeightMM(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DisplayHeightMM(dpy, scr)); }
+int XDisplayHeightMM(Display *dpy, int scr)
+{
+    return (DisplayHeightMM(dpy, scr));
+}
 
-int XDisplayPlanes(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DisplayPlanes(dpy, scr)); }
+int XDisplayPlanes(Display *dpy, int scr)
+{
+    return (DisplayPlanes(dpy, scr));
+}
 
-int XDisplayCells(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DisplayCells (dpy, scr)); }
+int XDisplayCells(Display *dpy, int scr)
+{
+    return (DisplayCells (dpy, scr));
+}
 
-int XScreenCount(dpy) Display *dpy; { return (ScreenCount(dpy)); }
+int XScreenCount(Display *dpy) { return (ScreenCount(dpy)); }
 
-char *XServerVendor(dpy)  Display *dpy; { return (ServerVendor(dpy)); }
+char *XServerVendor(Display *dpy) { return (ServerVendor(dpy)); }
 
-int XProtocolVersion(dpy)  Display *dpy; { return (ProtocolVersion(dpy)); }
+int XProtocolVersion(Display *dpy) { return (ProtocolVersion(dpy)); }
 
-int XProtocolRevision(dpy)  Display *dpy; { return (ProtocolRevision(dpy));}
+int XProtocolRevision(Display *dpy) { return (ProtocolRevision(dpy));}
 
-int XVendorRelease(dpy)  Display *dpy; { return (VendorRelease(dpy)); }
+int XVendorRelease(Display *dpy) { return (VendorRelease(dpy)); }
 
-char *XDisplayString(dpy)  Display *dpy; { return (DisplayString(dpy)); }
+char *XDisplayString(Display *dpy) { return (DisplayString(dpy)); }
 
-int XDefaultDepth(dpy, scr)
-    Display *dpy; int scr;
-	{ return(DefaultDepth(dpy, scr)); }
+int XDefaultDepth(Display *dpy, int scr)
+{
+    return(DefaultDepth(dpy, scr));
+}
 
-Colormap XDefaultColormap(dpy, scr)
-    Display *dpy; int scr;
-	{ return (DefaultColormap(dpy, scr)); }
+Colormap XDefaultColormap(Display *dpy, int scr)
+{
+    return (DefaultColormap(dpy, scr));
+}
 
-int XBitmapUnit(dpy) Display *dpy; { return (BitmapUnit(dpy)); }
+int XBitmapUnit(Display *dpy) { return (BitmapUnit(dpy)); }
 
-int XBitmapBitOrder(dpy) Display *dpy; { return (BitmapBitOrder(dpy)); }
+int XBitmapBitOrder(Display *dpy) { return (BitmapBitOrder(dpy)); }
 
-int XBitmapPad(dpy) Display *dpy; { return (BitmapPad(dpy)); }
+int XBitmapPad(Display *dpy) { return (BitmapPad(dpy)); }
 
-int XImageByteOrder(dpy) Display *dpy; { return (ImageByteOrder(dpy)); }
+int XImageByteOrder(Display *dpy) { return (ImageByteOrder(dpy)); }
 
-unsigned long XNextRequest(dpy)
-    Display *dpy;
-    {
-	return (NextRequest(dpy));
-    }
+unsigned long XNextRequest(Display *dpy)
+{
+    return (NextRequest(dpy));
+}
 
-unsigned long XLastKnownRequestProcessed(dpy)
-    Display *dpy;
-    { return (LastKnownRequestProcessed(dpy)); }
+unsigned long XLastKnownRequestProcessed(Display *dpy)
+{
+    return (LastKnownRequestProcessed(dpy));
+}
 
 /* screen oriented macros (toolkit) */
-Screen *XScreenOfDisplay(dpy, scr) Display *dpy; int scr;
-	{ return (ScreenOfDisplay(dpy, scr)); }
+Screen *XScreenOfDisplay(Display *dpy, int scr)
+{
+    return (ScreenOfDisplay(dpy, scr));
+}
 
-Screen *XDefaultScreenOfDisplay(dpy) Display *dpy;
-	{ return (DefaultScreenOfDisplay(dpy)); }
+Screen *XDefaultScreenOfDisplay(Display *dpy)
+{
+    return (DefaultScreenOfDisplay(dpy));
+}
 
-Display *XDisplayOfScreen(s) Screen *s; { return (DisplayOfScreen(s)); }
+Display *XDisplayOfScreen(Screen *s) { return (DisplayOfScreen(s)); }
 
-Window XRootWindowOfScreen(s) Screen *s; { return (RootWindowOfScreen(s)); }
+Window XRootWindowOfScreen(Screen *s) { return (RootWindowOfScreen(s)); }
 
-unsigned long XBlackPixelOfScreen(s) Screen *s; 
-	{ return (BlackPixelOfScreen(s)); }
+unsigned long XBlackPixelOfScreen(Screen *s)
+{
+    return (BlackPixelOfScreen(s));
+}
 
-unsigned long XWhitePixelOfScreen(s) Screen *s; 
-	{ return (WhitePixelOfScreen(s)); }
+unsigned long XWhitePixelOfScreen(Screen *s)
+{
+    return (WhitePixelOfScreen(s));
+}
 
-Colormap XDefaultColormapOfScreen(s) Screen *s; 
-	{ return (DefaultColormapOfScreen(s)); }
+Colormap XDefaultColormapOfScreen(Screen *s)
+{
+    return (DefaultColormapOfScreen(s));
+}
 
-int XDefaultDepthOfScreen(s) Screen *s; { return (DefaultDepthOfScreen(s)); }
+int XDefaultDepthOfScreen(Screen *s)
+{
+    return (DefaultDepthOfScreen(s));
+}
 
-GC XDefaultGCOfScreen(s) Screen *s; { return (DefaultGCOfScreen(s)); }
+GC XDefaultGCOfScreen(Screen *s)
+{
+    return (DefaultGCOfScreen(s));
+}
 
-Visual *XDefaultVisualOfScreen(s) Screen *s; 
-	{ return (DefaultVisualOfScreen(s)); }
+Visual *XDefaultVisualOfScreen(Screen *s)
+{
+    return (DefaultVisualOfScreen(s));
+}
 
-int XWidthOfScreen(s) Screen *s; { return (WidthOfScreen(s)); }
+int XWidthOfScreen(Screen *s) { return (WidthOfScreen(s)); }
 
-int XHeightOfScreen(s) Screen *s; { return (HeightOfScreen(s)); }
+int XHeightOfScreen(Screen *s) { return (HeightOfScreen(s)); }
 
-int XWidthMMOfScreen(s) Screen *s; { return (WidthMMOfScreen(s)); }
+int XWidthMMOfScreen(Screen *s) { return (WidthMMOfScreen(s)); }
 
-int XHeightMMOfScreen(s) Screen *s; { return (HeightMMOfScreen(s)); }
+int XHeightMMOfScreen(Screen *s) { return (HeightMMOfScreen(s)); }
 
-int XPlanesOfScreen(s) Screen *s; { return (PlanesOfScreen(s)); }
+int XPlanesOfScreen(Screen *s) { return (PlanesOfScreen(s)); }
 
-int XCellsOfScreen(s) Screen *s; { return (CellsOfScreen(s)); }
+int XCellsOfScreen(Screen *s) { return (CellsOfScreen(s)); }
 
-int XMinCmapsOfScreen(s) Screen *s; { return (MinCmapsOfScreen(s)); }
+int XMinCmapsOfScreen(Screen *s) { return (MinCmapsOfScreen(s)); }
 
-int XMaxCmapsOfScreen(s) Screen *s; { return (MaxCmapsOfScreen(s)); }
+int XMaxCmapsOfScreen(Screen *s) { return (MaxCmapsOfScreen(s)); }
 
-Bool XDoesSaveUnders(s) Screen *s; { return (DoesSaveUnders(s)); }
+Bool XDoesSaveUnders(Screen *s) { return (DoesSaveUnders(s)); }
 
-int XDoesBackingStore(s) Screen *s; { return (DoesBackingStore(s)); }
+int XDoesBackingStore(Screen *s) { return (DoesBackingStore(s)); }
 
-long XEventMaskOfScreen(s) Screen *s; { return (EventMaskOfScreen(s)); }
+long XEventMaskOfScreen(Screen *s) { return (EventMaskOfScreen(s)); }
 
-int XScreenNumberOfScreen (scr)
-    register Screen *scr;
+int XScreenNumberOfScreen (register Screen *scr)
 {
     register Display *dpy = scr->display;
     register Screen *dpyscr = dpy->screens;
@@ -238,8 +269,7 @@ int XAddPixel(
 
 
 int
-XNoOp (dpy)
-    register Display *dpy;
+XNoOp (register Display *dpy)
 {
     register xReq *req;