Switched function definitions from K&R to ANSI style.

52 files changed, 304 insertions, 317 deletions

diff --git a/src/xcms/AddDIC.c b/src/xcms/AddDIC.c
index d2638b1..6f2987f 100644
--- a/src/xcms/AddDIC.c
+++ b/src/xcms/AddDIC.c
@@ -57,8 +57,7 @@
  *	SYNOPSIS
  */
 Status
-XcmsAddColorSpace(pCS)
-    XcmsColorSpace *pCS;
+XcmsAddColorSpace(XcmsColorSpace *pCS)
 /*
  *	DESCRIPTION
  *		DI Color Spaces are managed on a global basis.
diff --git a/src/xcms/AddSF.c b/src/xcms/AddSF.c
index 3ab0514..395a234 100644
--- a/src/xcms/AddSF.c
+++ b/src/xcms/AddSF.c
@@ -57,8 +57,7 @@
  *	SYNOPSIS
  */
 Status
-XcmsAddFunctionSet(pNewFS)
-    XcmsFunctionSet *pNewFS;
+XcmsAddFunctionSet(XcmsFunctionSet *pNewFS)
 /*
  *	DESCRIPTION
  *		Additional Screen Color Characterization Function Sets are
diff --git a/src/xcms/CCC.c b/src/xcms/CCC.c
index 7d4a9b1..3ba62cd 100644
--- a/src/xcms/CCC.c
+++ b/src/xcms/CCC.c
@@ -87,16 +87,15 @@ from The Open Group.
  */
 
 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;
+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
@@ -174,9 +173,9 @@ XcmsCreateCCC(dpy, screenNumber, visual, clientWhitePt, gamutCompProc,
  *	SYNOPSIS
  */
 XcmsCCC 
-XcmsDefaultCCC(dpy, screenNumber)
-    Display *dpy;
-    int screenNumber;
+XcmsDefaultCCC(
+    Display *dpy,
+    int screenNumber)
 /*
  *	DESCRIPTION
  *		Given a Display and Screen, this routine creates
@@ -256,8 +255,7 @@ XcmsDefaultCCC(dpy, screenNumber)
  *	SYNOPSIS
  */
 void
-XcmsFreeCCC(ccc)
-    XcmsCCC ccc;
+XcmsFreeCCC(XcmsCCC ccc)
 /*
  *	DESCRIPTION
  *		Frees memory associated with a Color Conversion Context
diff --git a/src/xcms/CvCols.c b/src/xcms/CvCols.c
index fc343cd..0fcd55e 100644
--- a/src/xcms/CvCols.c
+++ b/src/xcms/CvCols.c
@@ -714,12 +714,12 @@ Continue:
  *	SYNOPSIS
  */
 Status
-XcmsConvertColors(ccc, pColors_in_out, nColors, targetFormat, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    XcmsColorFormat targetFormat;
-    Bool *pCompressed;
+XcmsConvertColors(
+    XcmsCCC ccc,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors,
+    XcmsColorFormat targetFormat,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		Convert XcmsColor structures to another format
diff --git a/src/xcms/HVC.c b/src/xcms/HVC.c
index b57e729..c242bac 100644
--- a/src/xcms/HVC.c
+++ b/src/xcms/HVC.c
@@ -330,11 +330,11 @@ XcmsTekHVC_ValidSpec(
  *	SYNOPSIS
  */
 Status
-XcmsTekHVCToCIEuvY(ccc, pHVC_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pHVC_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
+XcmsTekHVCToCIEuvY(
+    XcmsCCC ccc,
+    XcmsColor *pHVC_WhitePt,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors)
 /*
  *	DESCRIPTION
  *		Transforms an array of TekHVC color specifications, given
@@ -451,11 +451,11 @@ XcmsTekHVCToCIEuvY(ccc, pHVC_WhitePt, pColors_in_out, nColors)
  *	SYNOPSIS
  */
 Status
-XcmsCIEuvYToTekHVC(ccc, pHVC_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pHVC_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
+XcmsCIEuvYToTekHVC(
+    XcmsCCC ccc,
+    XcmsColor *pHVC_WhitePt,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors)
 /*
  *	DESCRIPTION
  *		Transforms an array of CIECIEuvY.color specifications, given
diff --git a/src/xcms/HVCGcC.c b/src/xcms/HVCGcC.c
index 10e0d48..35981d7 100644
--- a/src/xcms/HVCGcC.c
+++ b/src/xcms/HVCGcC.c
@@ -67,12 +67,12 @@
  */
 /* ARGSUSED */
 Status
-XcmsTekHVCClipC (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
+XcmsTekHVCClipC (
+    XcmsCCC ccc, 
+    XcmsColor *pColors_in_out, 
+    unsigned int nColors,
+    unsigned int i,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		Reduce the Chroma for a specific hue and value to
diff --git a/src/xcms/HVCGcV.c b/src/xcms/HVCGcV.c
index 4e2c636..b6761c8 100644
--- a/src/xcms/HVCGcV.c
+++ b/src/xcms/HVCGcV.c
@@ -67,12 +67,12 @@
  */
 /* ARGSUSED */
 Status
-XcmsTekHVCClipV (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
+XcmsTekHVCClipV (
+    XcmsCCC ccc, 
+    XcmsColor *pColors_in_out, 
+    unsigned int nColors,
+    unsigned int i,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		Return the closest value for a specific hue and chroma.
diff --git a/src/xcms/HVCGcVC.c b/src/xcms/HVCGcVC.c
index eef20ae..4171c72 100644
--- a/src/xcms/HVCGcVC.c
+++ b/src/xcms/HVCGcVC.c
@@ -75,12 +75,12 @@
  */
 /* ARGSUSED */
 Status
-XcmsTekHVCClipVC (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
+XcmsTekHVCClipVC (
+    XcmsCCC ccc, 
+    XcmsColor *pColors_in_out, 
+    unsigned int nColors,
+    unsigned int i,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		This routine will find the closest value and chroma 
diff --git a/src/xcms/HVCMnV.c b/src/xcms/HVCMnV.c
index 63a5108..fd33d2f 100644
--- a/src/xcms/HVCMnV.c
+++ b/src/xcms/HVCMnV.c
@@ -71,11 +71,11 @@
  *	SYNOPSIS
  */
 Status
-XcmsTekHVCQueryMinV (ccc, hue, chroma, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue;
-    XcmsFloat chroma;
-    XcmsColor *pColor_return;
+XcmsTekHVCQueryMinV (
+    XcmsCCC ccc,
+    XcmsFloat hue,
+    XcmsFloat chroma,
+    XcmsColor *pColor_return)
 
 /*
  *	DESCRIPTION
diff --git a/src/xcms/HVCMxC.c b/src/xcms/HVCMxC.c
index 64e7713..6e69237 100644
--- a/src/xcms/HVCMxC.c
+++ b/src/xcms/HVCMxC.c
@@ -74,11 +74,11 @@
  *	SYNOPSIS
  */
 Status
-XcmsTekHVCQueryMaxC(ccc, hue, value, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue;
-    XcmsFloat value;
-    XcmsColor *pColor_return;
+XcmsTekHVCQueryMaxC(
+    XcmsCCC ccc, 
+    XcmsFloat hue,
+    XcmsFloat value,
+    XcmsColor *pColor_return)
 /*
  *	DESCRIPTION
  *		Return the maximum chroma for a specific hue and value.
diff --git a/src/xcms/HVCMxV.c b/src/xcms/HVCMxV.c
index 34acdad..72d0ccb 100644
--- a/src/xcms/HVCMxV.c
+++ b/src/xcms/HVCMxV.c
@@ -74,11 +74,11 @@
  *	SYNOPSIS
  */
 Status
-XcmsTekHVCQueryMaxV(ccc, hue, chroma, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue;
-    XcmsFloat chroma;
-    XcmsColor *pColor_return;
+XcmsTekHVCQueryMaxV(
+    XcmsCCC ccc,
+    XcmsFloat hue,
+    XcmsFloat chroma,
+    XcmsColor *pColor_return)
 /*
  *	DESCRIPTION
  *		Return the maximum value for a specified hue and chroma.
diff --git a/src/xcms/HVCMxVC.c b/src/xcms/HVCMxVC.c
index 74183fc..c3726f0 100644
--- a/src/xcms/HVCMxVC.c
+++ b/src/xcms/HVCMxVC.c
@@ -182,10 +182,10 @@ _XcmsTekHVCQueryMaxVCRGB(
  *	SYNOPSIS
  */
 Status
-XcmsTekHVCQueryMaxVC (ccc, hue, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue;
-    XcmsColor *pColor_return;
+XcmsTekHVCQueryMaxVC (
+    XcmsCCC ccc,
+    XcmsFloat hue,
+    XcmsColor *pColor_return)
 
 /*
  *	DESCRIPTION
diff --git a/src/xcms/HVCMxVs.c b/src/xcms/HVCMxVs.c
index d90afa8..88376e5 100644
--- a/src/xcms/HVCMxVs.c
+++ b/src/xcms/HVCMxVs.c
@@ -67,11 +67,11 @@
  *	SYNOPSIS
  */
 Status
-XcmsTekHVCQueryMaxVSamples(ccc, hue, pColor_in_out, nSamples)
-    XcmsCCC ccc;
-    XcmsFloat hue;
-    XcmsColor *pColor_in_out;
-    unsigned int nSamples;
+XcmsTekHVCQueryMaxVSamples(
+    XcmsCCC ccc,
+    XcmsFloat hue,
+    XcmsColor *pColor_in_out,
+    unsigned int nSamples)
 
 /*
  *	DESCRIPTION
diff --git a/src/xcms/HVCWpAj.c b/src/xcms/HVCWpAj.c
index 558e90b..f9e2c38 100644
--- a/src/xcms/HVCWpAj.c
+++ b/src/xcms/HVCWpAj.c
@@ -67,15 +67,14 @@
  *	SYNOPSIS
  */
 Status
-XcmsTekHVCWhiteShiftColors(ccc, pWhitePtFrom, pWhitePtTo, destSpecFmt,
-	pColors_in_out, nColors, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pWhitePtFrom;
-    XcmsColor *pWhitePtTo;
-    XcmsColorFormat destSpecFmt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    Bool *pCompressed;
+XcmsTekHVCWhiteShiftColors(
+    XcmsCCC ccc,
+    XcmsColor *pWhitePtFrom,
+    XcmsColor *pWhitePtTo,
+    XcmsColorFormat destSpecFmt,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		Convert color specifications in an array of XcmsColor structures
diff --git a/src/xcms/IdOfPr.c b/src/xcms/IdOfPr.c
index a8eda89..47e4ec3 100644
--- a/src/xcms/IdOfPr.c
+++ b/src/xcms/IdOfPr.c
@@ -49,8 +49,7 @@
  *	SYNOPSIS
  */
 XcmsColorFormat
-XcmsFormatOfPrefix(prefix)
-    char *prefix;
+XcmsFormatOfPrefix(char *prefix)
 /*
  *	DESCRIPTION
  *		Returns the Color Space ID for the specified prefix
diff --git a/src/xcms/LRGB.c b/src/xcms/LRGB.c
index 1b3c5e5..dff6776 100644
--- a/src/xcms/LRGB.c
+++ b/src/xcms/LRGB.c
@@ -1469,11 +1469,11 @@ XcmsLRGB_RGBi_ParseString(
  */
 /* ARGSUSED */
 Status 
-XcmsCIEXYZToRGBi(ccc, pXcmsColors_in_out, nColors, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pXcmsColors_in_out;/* pointer to XcmsColors to convert 	*/
-    unsigned int nColors;	/* Number of colors			*/
-    Bool *pCompressed;		/* pointer to an array of Bool		*/
+XcmsCIEXYZToRGBi(
+    XcmsCCC ccc,
+    XcmsColor *pXcmsColors_in_out,/* pointer to XcmsColors to convert 	*/
+    unsigned int nColors,	/* Number of colors			*/
+    Bool *pCompressed)		/* pointer to an array of Bool		*/
 /*
  *	DESCRIPTION
  *		Converts color specifications in an array of XcmsColor
@@ -1591,11 +1591,11 @@ XcmsCIEXYZToRGBi(ccc, pXcmsColors_in_out, nColors, pCompressed)
  */
 /* ARGSUSED */
 Status 
-XcmsRGBiToCIEXYZ(ccc, pXcmsColors_in_out, nColors, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pXcmsColors_in_out;/* pointer to XcmsColors to convert 	*/
-    unsigned int nColors;	/* Number of colors			*/
-    Bool *pCompressed;		/* pointer to a bit array		*/
+XcmsRGBiToCIEXYZ(
+    XcmsCCC ccc,
+    XcmsColor *pXcmsColors_in_out,/* pointer to XcmsColors to convert 	*/
+    unsigned int nColors,	/* Number of colors			*/
+    Bool *pCompressed)		/* pointer to a bit array		*/
 /*
  *	DESCRIPTION
  *		Converts color specifications in an array of XcmsColor
@@ -1644,11 +1644,11 @@ XcmsRGBiToCIEXYZ(ccc, pXcmsColors_in_out, nColors, pCompressed)
  */
 /* ARGSUSED */
 Status 
-XcmsRGBiToRGB(ccc, pXcmsColors_in_out, nColors, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pXcmsColors_in_out;/* pointer to XcmsColors to convert 	*/
-    unsigned int nColors;	/* Number of colors			*/
-    Bool *pCompressed;		/* pointer to a bit array		*/
+XcmsRGBiToRGB(
+    XcmsCCC ccc,
+    XcmsColor *pXcmsColors_in_out,/* pointer to XcmsColors to convert 	*/
+    unsigned int nColors,	/* Number of colors			*/
+    Bool *pCompressed)		/* pointer to a bit array		*/
 /*
  *	DESCRIPTION
  *		Converts color specifications in an array of XcmsColor
diff --git a/src/xcms/Lab.c b/src/xcms/Lab.c
index 75ed21d..ae83110 100644
--- a/src/xcms/Lab.c
+++ b/src/xcms/Lab.c
@@ -232,11 +232,11 @@ XcmsCIELab_ValidSpec(
  *	SYNOPSIS
  */
 Status
-XcmsCIELabToCIEXYZ(ccc, pLab_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pLab_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
+XcmsCIELabToCIEXYZ(
+    XcmsCCC ccc,
+    XcmsColor *pLab_WhitePt,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors)
 /*
  *	DESCRIPTION
  *		Converts color specifications in an array of XcmsColor
@@ -335,11 +335,11 @@ XcmsCIELabToCIEXYZ(ccc, pLab_WhitePt, pColors_in_out, nColors)
  *	SYNOPSIS
  */
 Status
-XcmsCIEXYZToCIELab(ccc, pLab_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pLab_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
+XcmsCIEXYZToCIELab(
+    XcmsCCC ccc,
+    XcmsColor *pLab_WhitePt,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors)
 /*
  *	DESCRIPTION
  *		Converts color specifications in an array of XcmsColor
diff --git a/src/xcms/LabGcC.c b/src/xcms/LabGcC.c
index e210cd2..366f293 100644
--- a/src/xcms/LabGcC.c
+++ b/src/xcms/LabGcC.c
@@ -54,12 +54,12 @@
  */
 /* ARGSUSED */
 Status
-XcmsCIELabClipab (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
+XcmsCIELabClipab (
+    XcmsCCC ccc,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors,
+    unsigned int i,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		Reduce the Chroma for a specific hue and chroma to
diff --git a/src/xcms/LabGcL.c b/src/xcms/LabGcL.c
index 445e4da..9722c21 100644
--- a/src/xcms/LabGcL.c
+++ b/src/xcms/LabGcL.c
@@ -54,12 +54,12 @@
  */
 /* ARGSUSED */
 Status
-XcmsCIELabClipL (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
+XcmsCIELabClipL (
+    XcmsCCC ccc,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors,
+    unsigned int i,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		Return the closest L* for a specific hue and chroma.
diff --git a/src/xcms/LabGcLC.c b/src/xcms/LabGcLC.c
index f0726d9..47490cd 100644
--- a/src/xcms/LabGcLC.c
+++ b/src/xcms/LabGcLC.c
@@ -62,12 +62,12 @@
  */
 /* ARGSUSED */
 Status
-XcmsCIELabClipLab (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
+XcmsCIELabClipLab (
+    XcmsCCC ccc,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors,
+    unsigned int i,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		This routine will find the closest L* and chroma 
diff --git a/src/xcms/LabMnL.c b/src/xcms/LabMnL.c
index 8016c4e..9b4cd3d 100644
--- a/src/xcms/LabMnL.c
+++ b/src/xcms/LabMnL.c
@@ -62,11 +62,11 @@
  *	SYNOPSIS
  */
 Status
-XcmsCIELabQueryMinL(ccc, hue_angle, chroma, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsFloat chroma;
-    XcmsColor *pColor_return;
+XcmsCIELabQueryMinL(
+    XcmsCCC ccc,
+    XcmsFloat hue_angle,	    /* hue angle in degrees */
+    XcmsFloat chroma,
+    XcmsColor *pColor_return)
 /*
  *	DESCRIPTION
  *		Return the maximum Lstar for a specified hue_angle and chroma.
diff --git a/src/xcms/LabMxC.c b/src/xcms/LabMxC.c
index c57125b..acd83f2 100644
--- a/src/xcms/LabMxC.c
+++ b/src/xcms/LabMxC.c
@@ -65,11 +65,11 @@
  *	SYNOPSIS
  */
 Status
-XcmsCIELabQueryMaxC(ccc, hue_angle, L_star, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsFloat L_star;
-    XcmsColor *pColor_return;
+XcmsCIELabQueryMaxC(
+    XcmsCCC ccc,
+    XcmsFloat hue_angle,	    /* hue angle in degrees */
+    XcmsFloat L_star,
+    XcmsColor *pColor_return)
 /*
  *	DESCRIPTION
  *		Return the maximum chroma for a specific hue_angle and L_star.
diff --git a/src/xcms/LabMxL.c b/src/xcms/LabMxL.c
index 91b3f55..fbc39ee 100644
--- a/src/xcms/LabMxL.c
+++ b/src/xcms/LabMxL.c
@@ -62,11 +62,11 @@
  *	SYNOPSIS
  */
 Status
-XcmsCIELabQueryMaxL(ccc, hue_angle, chroma, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	/* hue in degrees */
-    XcmsFloat chroma;
-    XcmsColor *pColor_return;
+XcmsCIELabQueryMaxL(
+    XcmsCCC ccc,
+    XcmsFloat hue_angle,	/* hue in degrees */
+    XcmsFloat chroma,
+    XcmsColor *pColor_return)
 /*
  *	DESCRIPTION
  *		Return the maximum Lstar for a specified hue_angle and chroma.
diff --git a/src/xcms/LabMxLC.c b/src/xcms/LabMxLC.c
index d4efba3..c24dd4b 100644
--- a/src/xcms/LabMxLC.c
+++ b/src/xcms/LabMxLC.c
@@ -172,10 +172,10 @@ _XcmsCIELabQueryMaxLCRGB(
  *	SYNOPSIS
  */
 Status
-XcmsCIELabQueryMaxLC (ccc, hue_angle, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue_angle in degrees */
-    XcmsColor *pColor_return;
+XcmsCIELabQueryMaxLC (
+    XcmsCCC ccc,
+    XcmsFloat hue_angle,	    /* hue_angle in degrees */
+    XcmsColor *pColor_return)
 
 /*
  *	DESCRIPTION
diff --git a/src/xcms/LabWpAj.c b/src/xcms/LabWpAj.c
index 38c57d2..3098a60 100644
--- a/src/xcms/LabWpAj.c
+++ b/src/xcms/LabWpAj.c
@@ -59,15 +59,14 @@
  *	SYNOPSIS
  */
 Status
-XcmsCIELabWhiteShiftColors(ccc, pWhitePtFrom, pWhitePtTo, destSpecFmt,
-	pColors_in_out, nColors, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pWhitePtFrom;
-    XcmsColor *pWhitePtTo;
-    XcmsColorFormat destSpecFmt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    Bool *pCompressed;
+XcmsCIELabWhiteShiftColors(
+    XcmsCCC ccc,
+    XcmsColor *pWhitePtFrom,
+    XcmsColor *pWhitePtTo,
+    XcmsColorFormat destSpecFmt,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		Adjust color specifications in XcmsColor structures for
diff --git a/src/xcms/Luv.c b/src/xcms/Luv.c
index f6567ac..9fe80a0 100644
--- a/src/xcms/Luv.c
+++ b/src/xcms/Luv.c
@@ -233,11 +233,11 @@ XcmsCIELuv_ValidSpec(
  *	SYNOPSIS
  */
 Status
-XcmsCIELuvToCIEuvY(ccc, pLuv_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pLuv_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
+XcmsCIELuvToCIEuvY(
+    XcmsCCC ccc,
+    XcmsColor *pLuv_WhitePt,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors)
 /*
  *	DESCRIPTION
  *		Converts color specifications in an array of XcmsColor
@@ -325,11 +325,11 @@ XcmsCIELuvToCIEuvY(ccc, pLuv_WhitePt, pColors_in_out, nColors)
  *	SYNOPSIS
  */
 Status
-XcmsCIEuvYToCIELuv(ccc, pLuv_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pLuv_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
+XcmsCIEuvYToCIELuv(
+    XcmsCCC ccc,
+    XcmsColor *pLuv_WhitePt,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors)
 /*
  *	DESCRIPTION
  *		Converts color specifications in an array of XcmsColor
diff --git a/src/xcms/LuvGcC.c b/src/xcms/LuvGcC.c
index ecae0fe..c4fde28 100644
--- a/src/xcms/LuvGcC.c
+++ b/src/xcms/LuvGcC.c
@@ -54,12 +54,12 @@
  */
 /* ARGSUSED */
 Status
-XcmsCIELuvClipuv (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
+XcmsCIELuvClipuv (
+    XcmsCCC ccc,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors,
+    unsigned int i,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		Reduce the Chroma for a specific hue and chroma to
diff --git a/src/xcms/LuvGcL.c b/src/xcms/LuvGcL.c
index 81a553d..c7ccc75 100644
--- a/src/xcms/LuvGcL.c
+++ b/src/xcms/LuvGcL.c
@@ -54,12 +54,12 @@
  */
 /* ARGSUSED */
 Status
-XcmsCIELuvClipL (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
+XcmsCIELuvClipL (
+    XcmsCCC ccc,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors,
+    unsigned int i,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		Return the closest L* for a specific hue and chroma.
diff --git a/src/xcms/LuvGcLC.c b/src/xcms/LuvGcLC.c
index a3cc0f6..f2eab37 100644
--- a/src/xcms/LuvGcLC.c
+++ b/src/xcms/LuvGcLC.c
@@ -62,12 +62,12 @@
  */
 /* ARGSUSED */
 Status
-XcmsCIELuvClipLuv (ccc, pColors_in_out, nColors, i, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    unsigned int i;
-    Bool *pCompressed;
+XcmsCIELuvClipLuv (
+    XcmsCCC ccc,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors,
+    unsigned int i,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		This routine will find the closest L* and chroma 
diff --git a/src/xcms/LuvMnL.c b/src/xcms/LuvMnL.c
index 9938ab4..2286d7e 100644
--- a/src/xcms/LuvMnL.c
+++ b/src/xcms/LuvMnL.c
@@ -62,11 +62,11 @@
  *	SYNOPSIS
  */
 Status
-XcmsCIELuvQueryMinL(ccc, hue_angle, chroma, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsFloat chroma;
-    XcmsColor *pColor_return;
+XcmsCIELuvQueryMinL(
+    XcmsCCC ccc,
+    XcmsFloat hue_angle,	    /* hue angle in degrees */
+    XcmsFloat chroma,
+    XcmsColor *pColor_return)
 /*
  *	DESCRIPTION
  *		Return the maximum Lstar for a specified hue_angle and chroma.
diff --git a/src/xcms/LuvMxC.c b/src/xcms/LuvMxC.c
index c77319d..d228c39 100644
--- a/src/xcms/LuvMxC.c
+++ b/src/xcms/LuvMxC.c
@@ -65,11 +65,11 @@
  *	SYNOPSIS
  */
 Status
-XcmsCIELuvQueryMaxC(ccc, hue_angle, L_star, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsFloat L_star;
-    XcmsColor *pColor_return;
+XcmsCIELuvQueryMaxC(
+    XcmsCCC ccc,
+    XcmsFloat hue_angle,	    /* hue angle in degrees */
+    XcmsFloat L_star,
+    XcmsColor *pColor_return)
 /*
  *	DESCRIPTION
  *		Return the maximum chroma for a specific hue_angle and L_star.
diff --git a/src/xcms/LuvMxL.c b/src/xcms/LuvMxL.c
index d364078..f24c414 100644
--- a/src/xcms/LuvMxL.c
+++ b/src/xcms/LuvMxL.c
@@ -62,11 +62,11 @@
  *	SYNOPSIS
  */
 Status
-XcmsCIELuvQueryMaxL(ccc, hue_angle, chroma, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsFloat chroma;
-    XcmsColor *pColor_return;
+XcmsCIELuvQueryMaxL(
+    XcmsCCC ccc,
+    XcmsFloat hue_angle,	    /* hue angle in degrees */
+    XcmsFloat chroma,
+    XcmsColor *pColor_return)
 /*
  *	DESCRIPTION
  *		Return the maximum Lstar for a specified hue_angle and chroma.
diff --git a/src/xcms/LuvMxLC.c b/src/xcms/LuvMxLC.c
index 3f4c229..941e459 100644
--- a/src/xcms/LuvMxLC.c
+++ b/src/xcms/LuvMxLC.c
@@ -172,10 +172,10 @@ _XcmsCIELuvQueryMaxLCRGB(
  *	SYNOPSIS
  */
 Status
-XcmsCIELuvQueryMaxLC (ccc, hue_angle, pColor_return)
-    XcmsCCC ccc;
-    XcmsFloat hue_angle;	    /* hue angle in degrees */
-    XcmsColor *pColor_return;
+XcmsCIELuvQueryMaxLC (
+    XcmsCCC ccc,
+    XcmsFloat hue_angle,	    /* hue angle in degrees */
+    XcmsColor *pColor_return)
 
 /*
  *	DESCRIPTION
diff --git a/src/xcms/LuvWpAj.c b/src/xcms/LuvWpAj.c
index c48531a..86a60b4 100644
--- a/src/xcms/LuvWpAj.c
+++ b/src/xcms/LuvWpAj.c
@@ -56,15 +56,14 @@
  *	SYNOPSIS
  */
 Status
-XcmsCIELuvWhiteShiftColors(ccc, pWhitePtFrom, pWhitePtTo, destSpecFmt,
-	pColors_in_out, nColors, pCompressed)
-    XcmsCCC ccc;
-    XcmsColor *pWhitePtFrom;
-    XcmsColor *pWhitePtTo;
-    XcmsColorFormat destSpecFmt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
-    Bool *pCompressed;
+XcmsCIELuvWhiteShiftColors(
+    XcmsCCC ccc,
+    XcmsColor *pWhitePtFrom,
+    XcmsColor *pWhitePtTo,
+    XcmsColorFormat destSpecFmt,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		Adjusts color specifications in an array of XcmsColor
diff --git a/src/xcms/OfCCC.c b/src/xcms/OfCCC.c
index 1f96316..1c9e16b 100644
--- a/src/xcms/OfCCC.c
+++ b/src/xcms/OfCCC.c
@@ -56,8 +56,8 @@
  */
 
 Display *
-XcmsDisplayOfCCC(ccc)
-    XcmsCCC ccc;
+XcmsDisplayOfCCC(
+    XcmsCCC ccc)
 /*
  *	DESCRIPTION
  *		Queries the Display of the specified CCC.
@@ -79,8 +79,8 @@ XcmsDisplayOfCCC(ccc)
  */
 
 Visual *
-XcmsVisualOfCCC(ccc)
-    XcmsCCC ccc;
+XcmsVisualOfCCC(
+    XcmsCCC ccc)
 /*
  *	DESCRIPTION
  *		Queries the Visual of the specified CCC.
@@ -102,8 +102,8 @@ XcmsVisualOfCCC(ccc)
  */
 
 int
-XcmsScreenNumberOfCCC(ccc)
-    XcmsCCC ccc;
+XcmsScreenNumberOfCCC(
+    XcmsCCC ccc)
 /*
  *	DESCRIPTION
  *		Queries the screen number of the specified CCC.
@@ -125,8 +125,8 @@ XcmsScreenNumberOfCCC(ccc)
  */
 
 XcmsColor *
-XcmsScreenWhitePointOfCCC(ccc)
-    XcmsCCC ccc;
+XcmsScreenWhitePointOfCCC(
+    XcmsCCC ccc)
 /*
  *	DESCRIPTION
  *		Queries the screen white point of the specified CCC.
@@ -148,8 +148,8 @@ XcmsScreenWhitePointOfCCC(ccc)
  */
 
 XcmsColor *
-XcmsClientWhitePointOfCCC(ccc)
-    XcmsCCC ccc;
+XcmsClientWhitePointOfCCC(
+    XcmsCCC ccc)
 /*
  *	DESCRIPTION
  *		Queries the client white point of the specified CCC.
diff --git a/src/xcms/PrOfId.c b/src/xcms/PrOfId.c
index d8fe6e9..01d2c26 100644
--- a/src/xcms/PrOfId.c
+++ b/src/xcms/PrOfId.c
@@ -49,8 +49,8 @@
  *	SYNOPSIS
  */
 char *
-XcmsPrefixOfFormat(id)
-    XcmsColorFormat	id;
+XcmsPrefixOfFormat(
+    XcmsColorFormat	id)
 /*
  *	DESCRIPTION
  *		Returns the color space prefix for the specified color
diff --git a/src/xcms/QBlack.c b/src/xcms/QBlack.c
index ec04494..cdeae03 100644
--- a/src/xcms/QBlack.c
+++ b/src/xcms/QBlack.c
@@ -56,10 +56,10 @@
  */
 
 Status
-XcmsQueryBlack(ccc, target_format, pColor_ret)
-    XcmsCCC ccc;
-    XcmsColorFormat target_format;
-    XcmsColor *pColor_ret;
+XcmsQueryBlack(
+    XcmsCCC ccc,
+    XcmsColorFormat target_format,
+    XcmsColor *pColor_ret)
 /*
  *	DESCRIPTION
  *		Returns the color specification in the target format for
diff --git a/src/xcms/QBlue.c b/src/xcms/QBlue.c
index 6026851..eae77dd 100644
--- a/src/xcms/QBlue.c
+++ b/src/xcms/QBlue.c
@@ -56,10 +56,10 @@
  */
 
 Status
-XcmsQueryBlue(ccc, target_format, pColor_ret)
-    XcmsCCC ccc;
-    XcmsColorFormat target_format;
-    XcmsColor *pColor_ret;
+XcmsQueryBlue(
+    XcmsCCC ccc,
+    XcmsColorFormat target_format,
+    XcmsColor *pColor_ret)
 /*
  *	DESCRIPTION
  *		Returns the color specification in the target format for
diff --git a/src/xcms/QGreen.c b/src/xcms/QGreen.c
index 59bbbd5..deb24cc 100644
--- a/src/xcms/QGreen.c
+++ b/src/xcms/QGreen.c
@@ -56,10 +56,10 @@
  */
 
 Status
-XcmsQueryGreen(ccc, target_format, pColor_ret)
-    XcmsCCC ccc;
-    XcmsColorFormat target_format;
-    XcmsColor *pColor_ret;
+XcmsQueryGreen(
+    XcmsCCC ccc,
+    XcmsColorFormat target_format,
+    XcmsColor *pColor_ret)
 /*
  *	DESCRIPTION
  *		Returns the color specification in the target format for
diff --git a/src/xcms/QRed.c b/src/xcms/QRed.c
index bcd276c..51b6be4 100644
--- a/src/xcms/QRed.c
+++ b/src/xcms/QRed.c
@@ -56,10 +56,10 @@
  */
 
 Status
-XcmsQueryRed(ccc, target_format, pColor_ret)
-    XcmsCCC ccc;
-    XcmsColorFormat target_format;
-    XcmsColor *pColor_ret;
+XcmsQueryRed(
+    XcmsCCC ccc,
+    XcmsColorFormat target_format,
+    XcmsColor *pColor_ret)
 /*
  *	DESCRIPTION
  *		Returns the color specification in the target format for
diff --git a/src/xcms/QWhite.c b/src/xcms/QWhite.c
index 7e58db6..d23443d 100644
--- a/src/xcms/QWhite.c
+++ b/src/xcms/QWhite.c
@@ -56,10 +56,10 @@
  */
 
 Status
-XcmsQueryWhite(ccc, target_format, pColor_ret)
-    XcmsCCC ccc;
-    XcmsColorFormat target_format;
-    XcmsColor *pColor_ret;
+XcmsQueryWhite(
+    XcmsCCC ccc,
+    XcmsColorFormat target_format,
+    XcmsColor *pColor_ret)
 /*
  *	DESCRIPTION
  *		Returns the color specification in the target format for
diff --git a/src/xcms/QuCol.c b/src/xcms/QuCol.c
index 0864bc8..7944faa 100644
--- a/src/xcms/QuCol.c
+++ b/src/xcms/QuCol.c
@@ -55,11 +55,11 @@
  *	SYNOPSIS
  */
 Status
-XcmsQueryColor(dpy, colormap, pXcmsColor_in_out, result_format)
-    Display *dpy;
-    Colormap colormap;
-    XcmsColor *pXcmsColor_in_out;
-    XcmsColorFormat result_format;
+XcmsQueryColor(
+    Display *dpy,
+    Colormap colormap,
+    XcmsColor *pXcmsColor_in_out,
+    XcmsColorFormat result_format)
 /*
  *	DESCRIPTION
  *		This routine uses XQueryColor to obtain the X RGB values
diff --git a/src/xcms/QuCols.c b/src/xcms/QuCols.c
index d6c4890..7a0816d 100644
--- a/src/xcms/QuCols.c
+++ b/src/xcms/QuCols.c
@@ -54,12 +54,12 @@
  *	SYNOPSIS
  */
 Status
-XcmsQueryColors(dpy, colormap, pXcmsColors_in_out, nColors, result_format)
-    Display *dpy;
-    Colormap colormap;
-    XcmsColor *pXcmsColors_in_out;
-    unsigned int nColors;
-    XcmsColorFormat result_format;
+XcmsQueryColors(
+    Display *dpy,
+    Colormap colormap,
+    XcmsColor *pXcmsColors_in_out,
+    unsigned int nColors,
+    XcmsColorFormat result_format)
 /*
  *	DESCRIPTION
  *		This routine uses XQueryColors to obtain the X RGB values
diff --git a/src/xcms/SetCCC.c b/src/xcms/SetCCC.c
index 8ab0464..a7094b1 100644
--- a/src/xcms/SetCCC.c
+++ b/src/xcms/SetCCC.c
@@ -57,9 +57,9 @@
  */
 
 Status
-XcmsSetWhitePoint(ccc, pColor)
-    XcmsCCC ccc;
-    XcmsColor *pColor;
+XcmsSetWhitePoint(
+    XcmsCCC ccc,
+    XcmsColor *pColor)
 /*
  *	DESCRIPTION
  *		Sets the Client White Point in the specified CCC.
diff --git a/src/xcms/StCol.c b/src/xcms/StCol.c
index 80c3f7d..fef449e 100644
--- a/src/xcms/StCol.c
+++ b/src/xcms/StCol.c
@@ -55,10 +55,10 @@
  *	SYNOPSIS
  */
 Status
-XcmsStoreColor(dpy, colormap, pColor_in)
-    Display *dpy;
-    Colormap colormap;
-    XcmsColor *pColor_in;
+XcmsStoreColor(
+    Display *dpy,
+    Colormap colormap,
+    XcmsColor *pColor_in)
 /*
  *	DESCRIPTION
  *		Given a device-dependent or device-independent color
diff --git a/src/xcms/StCols.c b/src/xcms/StCols.c
index cff6cc3..163d621 100644
--- a/src/xcms/StCols.c
+++ b/src/xcms/StCols.c
@@ -55,13 +55,12 @@
  *	SYNOPSIS
  */
 Status
-XcmsStoreColors(dpy, colormap, pColors_in,
-	nColors, pCompressed)
-    Display *dpy;
-    Colormap colormap;
-    XcmsColor *pColors_in;
-    unsigned int nColors;
-    Bool *pCompressed;
+XcmsStoreColors(
+    Display *dpy,
+    Colormap colormap,
+    XcmsColor *pColors_in,
+    unsigned int nColors,
+    Bool *pCompressed)
 /*
  *	DESCRIPTION
  *		Given device-dependent or device-independent color
diff --git a/src/xcms/cmsAllCol.c b/src/xcms/cmsAllCol.c
index 3aca573..145d117 100644
--- a/src/xcms/cmsAllCol.c
+++ b/src/xcms/cmsAllCol.c
@@ -49,11 +49,11 @@
  *	SYNOPSIS
  */
 Status
-XcmsAllocColor(dpy, colormap, pXcmsColor_in_out, result_format)
-    Display *dpy;
-    Colormap colormap;
-    XcmsColor *pXcmsColor_in_out;
-    XcmsColorFormat result_format;
+XcmsAllocColor(
+    Display *dpy,
+    Colormap colormap,
+    XcmsColor *pXcmsColor_in_out,
+    XcmsColorFormat result_format)
 /*
  *	DESCRIPTION
  *		Given a device-dependent or device-independent color
diff --git a/src/xcms/cmsCmap.c b/src/xcms/cmsCmap.c
index 5c6d1a1..e213682 100644
--- a/src/xcms/cmsCmap.c
+++ b/src/xcms/cmsCmap.c
@@ -236,11 +236,11 @@ CmapRecForColormap(
  *	SYNOPSIS
  */
 XcmsCmapRec *
-_XcmsAddCmapRec(dpy, cmap, windowID, visual)
-    Display *dpy;
-    Colormap cmap;
-    Window windowID;
-    Visual *visual;
+_XcmsAddCmapRec(
+    Display *dpy,
+    Colormap cmap,
+    Window windowID,
+    Visual *visual)
 /*
  *	DESCRIPTION
  *		Create an XcmsCmapRec for the specified cmap, windowID,
@@ -412,9 +412,9 @@ _XcmsFreeClientCmaps(
  *	SYNOPSIS
  */
 XcmsCCC 
-XcmsCCCOfColormap(dpy, cmap)
-    Display *dpy;
-    Colormap cmap;
+XcmsCCCOfColormap(
+    Display *dpy,
+    Colormap cmap)
 /*
  *	DESCRIPTION
  *		Finds the XcmsCCC associated with the specified colormap.
@@ -480,10 +480,10 @@ XcmsCCCOfColormap(dpy, cmap)
     return(NULL);
 }
 
-XcmsCCC XcmsSetCCCOfColormap(dpy, cmap, ccc)
-    Display *dpy;
-    Colormap cmap;
-    XcmsCCC ccc;
+XcmsCCC XcmsSetCCCOfColormap(
+    Display *dpy,
+    Colormap cmap,
+    XcmsCCC ccc)
 {
     XcmsCCC prev_ccc = NULL;
     XcmsCmapRec *pRec;
diff --git a/src/xcms/cmsMath.c b/src/xcms/cmsMath.c
index c97c7a9..5e8cae7 100644
--- a/src/xcms/cmsMath.c
+++ b/src/xcms/cmsMath.c
@@ -53,8 +53,7 @@ int sqrt_loopcount;
 /* for cube roots, x^3 - a = 0,  x_new = x - 1/3 (x - a/x^2) */
 
 double
-_XcmsCubeRoot(a)
-    double a;
+_XcmsCubeRoot(double a)
 {
     register double abs_a, cur_guess, delta;
 
@@ -98,8 +97,7 @@ _XcmsCubeRoot(a)
 /* for square roots, x^2 - a = 0,  x_new = x - 1/2 (x - a/x) */
 
 double
-_XcmsSquareRoot(a)
-    double a;
+_XcmsSquareRoot(double a)
 {
     register double cur_guess, delta;
 
diff --git a/src/xcms/cmsTrig.c b/src/xcms/cmsTrig.c
index 1859fa9..4e17e7d 100644
--- a/src/xcms/cmsTrig.c
+++ b/src/xcms/cmsTrig.c
@@ -509,8 +509,7 @@ static double _XcmsPolynomial(
  */
 
 double
-_XcmsSine (x)
-double x;
+_XcmsSine (double x)
 {
     double y;
     double yt2;
@@ -550,8 +549,7 @@ double x;
  *	SYNOPSIS
  */
 double
-_XcmsArcTangent(x)
-    double x;
+_XcmsArcTangent(double x)
 /*
  *	DESCRIPTION
  *		Computes the arctangent.
diff --git a/src/xcms/uvY.c b/src/xcms/uvY.c
index 46e9c19..da9fd0f 100644
--- a/src/xcms/uvY.c
+++ b/src/xcms/uvY.c
@@ -227,11 +227,11 @@ _XcmsCIEuvY_ValidSpec(
  *	SYNOPSIS
  */
 Status
-XcmsCIEuvYToCIEXYZ(ccc, puvY_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *puvY_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
+XcmsCIEuvYToCIEXYZ(
+    XcmsCCC ccc,
+    XcmsColor *puvY_WhitePt,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors)
 /*
  *	DESCRIPTION
  *		Converts color specifications in an array of XcmsColor
@@ -342,11 +342,11 @@ XcmsCIEuvYToCIEXYZ(ccc, puvY_WhitePt, pColors_in_out, nColors)
  *	SYNOPSIS
  */
 Status
-XcmsCIEXYZToCIEuvY(ccc, puvY_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *puvY_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
+XcmsCIEXYZToCIEuvY(
+    XcmsCCC ccc,
+    XcmsColor *puvY_WhitePt,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors)
 /*
  *	DESCRIPTION
  *		Converts color specifications in an array of XcmsColor
diff --git a/src/xcms/xyY.c b/src/xcms/xyY.c
index b15e901..2e56a08 100644
--- a/src/xcms/xyY.c
+++ b/src/xcms/xyY.c
@@ -235,11 +235,11 @@ XcmsCIExyY_ValidSpec(
  *	SYNOPSIS
  */
 Status
-XcmsCIExyYToCIEXYZ(ccc, pxyY_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pxyY_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
+XcmsCIExyYToCIEXYZ(
+    XcmsCCC ccc,
+    XcmsColor *pxyY_WhitePt,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors)
 /*
  *	DESCRIPTION
  *		Converts color specifications in an array of XcmsColor
@@ -342,11 +342,11 @@ XcmsCIExyYToCIEXYZ(ccc, pxyY_WhitePt, pColors_in_out, nColors)
  */
 /* ARGSUSED */
 Status
-XcmsCIEXYZToCIExyY(ccc, pxyY_WhitePt, pColors_in_out, nColors)
-    XcmsCCC ccc;
-    XcmsColor *pxyY_WhitePt;
-    XcmsColor *pColors_in_out;
-    unsigned int nColors;
+XcmsCIEXYZToCIExyY(
+    XcmsCCC ccc,
+    XcmsColor *pxyY_WhitePt,
+    XcmsColor *pColors_in_out,
+    unsigned int nColors)
 /*
  *	DESCRIPTION
  *		Converts color specifications in an array of XcmsColor