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, 19 insertions, 21 deletions

diff --git a/nx-X11/lib/X11/CCC.c b/nx-X11/lib/X11/CCC.c
index 021fb14a2..090b1078c 100644
--- a/nx-X11/lib/X11/CCC.c
+++ b/nx-X11/lib/X11/CCC.c
@@ -2,7 +2,7 @@
 /*
  * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
  * 	All Rights Reserved
- * 
+ *
  * This file is a component of an X Window System-specific implementation
  * of Xcms based on the TekColor Color Management System.  Permission is
  * hereby granted to use, copy, modify, sell, and otherwise distribute this
@@ -10,10 +10,10 @@
  * that this copyright, permission, and disclaimer notice is reproduced in
  * all copies of this software and in supporting documentation.  TekColor
  * is a trademark of Tektronix, Inc.
- * 
+ *
  * Tektronix makes no representation about the suitability of this software
  * for any purpose.  It is provided "as is" and with all faults.
- * 
+ *
  * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
  * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
  * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
@@ -84,17 +84,16 @@ from The Open Group.
  *	SYNOPSIS
  */
 
-XcmsCCC 
-XcmsCreateCCC(dpy, screenNumber, visual, clientWhitePt, gamutCompProc,
-	gamutCompClientData, whitePtAdjProc, whitePtAdjClientData)
-    Display *dpy;
-    int	screenNumber;
-    Visual *visual;
-    XcmsColor *clientWhitePt;
-    XcmsCompressionProc gamutCompProc;
-    XPointer gamutCompClientData;
-    XcmsWhiteAdjustProc whitePtAdjProc;
-    XPointer whitePtAdjClientData;
+XcmsCCC
+XcmsCreateCCC(
+    Display *dpy,
+    int screenNumber,
+    Visual *visual,
+    XcmsColor *clientWhitePt,
+    XcmsCompressionProc gamutCompProc,
+    XPointer gamutCompClientData,
+    XcmsWhiteAdjustProc whitePtAdjProc,
+    XPointer whitePtAdjClientData)
 /*
  *	DESCRIPTION
  *		Given a Display, Screen, Visual, etc., this routine creates
@@ -114,7 +113,7 @@ XcmsCreateCCC(dpy, screenNumber, visual, clientWhitePt, gamutCompProc,
     if (pDefaultCCC == NULL ||
 	    !(newccc = (XcmsCCC) Xcalloc(1, (unsigned) sizeof(XcmsCCCRec)))) {
 	return(NULL);
-    } 
+    }
 
     /*
      * Should inherit the following as result of a memmove():
@@ -171,10 +170,10 @@ XcmsCreateCCC(dpy, screenNumber, visual, clientWhitePt, gamutCompProc,
  *
  *	SYNOPSIS
  */
-XcmsCCC 
-XcmsDefaultCCC(dpy, screenNumber)
-    Display *dpy;
-    int screenNumber;
+XcmsCCC
+XcmsDefaultCCC(
+    Display *dpy,
+    int screenNumber)
 /*
  *	DESCRIPTION
  *		Given a Display and Screen, this routine creates
@@ -254,8 +253,7 @@ XcmsDefaultCCC(dpy, screenNumber)
  *	SYNOPSIS
  */
 void
-XcmsFreeCCC(ccc)
-    XcmsCCC ccc;
+XcmsFreeCCC(XcmsCCC ccc)
 /*
  *	DESCRIPTION
  *		Frees memory associated with a Color Conversion Context