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, 11 insertions, 9 deletions

diff --git a/nx-X11/lib/X11/CrPFBData.c b/nx-X11/lib/X11/CrPFBData.c
index 872dc204e..57cd15303 100644
--- a/nx-X11/lib/X11/CrPFBData.c
+++ b/nx-X11/lib/X11/CrPFBData.c
@@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group.
 /*
  * XCreatePixmapFromBitmapData: Routine to make a pixmap from user supplied bitmap data.
  *             D is any drawable on the same screen that the pixmap will be used in.
- *             Data is a pointer to the bit data, and 
+ *             Data is a pointer to the bit data, and
  *             width & height give the size in bits of the pixmap.
  *             Fg and Bg are the pixel values to use for the two colors.
  *             Depth is the depth of the pixmap to create.
@@ -47,14 +47,16 @@ in this Software without prior written authorization from The Open Group.
  *    bitmap_unit=8
  *    xoffset=0
  *    no extra bytes per line
- */  
-Pixmap XCreatePixmapFromBitmapData(display,d,data,width,height,fg,bg,depth)
-    Display *display;
-    Drawable d;
-    char *data;
-    unsigned int width, height;
-    unsigned long fg, bg;
-    unsigned int depth;
+ */
+Pixmap XCreatePixmapFromBitmapData(
+    Display *display,
+    Drawable d,
+    char *data,
+    unsigned int width,
+    unsigned int height,
+    unsigned long fg,
+    unsigned long bg,
+    unsigned int depth)
 {
     XImage ximage;
     GC gc;