--- a/open-src/app/xcolor/sun-src/XCrHsbCmap.c	Wed May 18 13:42:51 2011 -0700
+++ b/open-src/app/xcolor/sun-src/XCrHsbCmap.c	Fri May 20 21:05:21 2011 -0700
@@ -1,7 +1,7 @@
 /*-
  * XCrHsbCmap.c - X11 library routine to create an HSB ramp colormaps.
  *
- * Copyright (c) 1991, 1995, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1991, 2011, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,23 +29,22 @@
 #include <X11/X.h>
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
-
-extern void HSBmap();
+#include "xcolor.h"
 
 Status
-XCreateHSBColormap(dsp, screen, cmap, count, h1, s1, b1, h2, s2, b2, bw, visual)
-    Display    *dsp;
-    int         screen;
-    Colormap   *cmap;		/* colormap return value */
-    int         count;		/* number of entrys to use */
+XCreateHSBColormap(
+    Display    *dsp,
+    int         screen,
+    Colormap   *cmap,		/* colormap return value */
+    int         count,		/* number of entries to use */
     double      h1,		/* starting hue */
-                s1,		/* starting saturation */
-                b1,		/* starting brightness */
-                h2,		/* ending hue */
-                s2,		/* ending saturation */
-                b2;		/* ending brightness */
-    int         bw;		/* Boolean: True = save black and white */
-    Visual    **visual;
+    double      s1,		/* starting saturation */
+    double      b1,		/* starting brightness */
+    double      h2,		/* ending hue */
+    double      s2,		/* ending saturation */
+    double      b2,		/* ending brightness */
+    int         bw,		/* Boolean: True = save black and white */
+    Visual    **visual)
 {
     u_char      red[256];
     u_char      green[256];