updated for TekCMS on excess

16 files changed, 18 insertions, 39 deletions

diff --git a/xc/lib/X11/CCC.c b/xc/lib/X11/CCC.c
index 6d2c8953e..4f646b370 100644
--- a/xc/lib/X11/CCC.c
+++ b/xc/lib/X11/CCC.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XcmsCCC.c,v 1.2 91/02/05 13:41:23 dave Exp $" */
+/* $XConsortium: XcmsCCC.c,v 1.3 91/02/07 15:43:01 dave Exp $" */
 
 /*
  * (c) Copyright 1990 1991 Tektronix Inc.
diff --git a/xc/lib/X11/GetColor.c b/xc/lib/X11/GetColor.c
index f915cf833..62b0b4b3f 100644
--- a/xc/lib/X11/GetColor.c
+++ b/xc/lib/X11/GetColor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XGetColor.c,v 11.17 91/01/06 11:45:53 rws Exp $ */
+/* $XConsortium: XGetColor.c,v 11.18 91/02/05 13:40:33 dave Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1986	*/
 
 /*
@@ -18,8 +18,6 @@ without express or implied warranty.
 #include "Xlibint.h"
 #include "TekCMS.h"
 
-extern XcmsCCC *XcmsCCCofColormap();
-
 #if NeedFunctionPrototypes
 Status XAllocNamedColor(
 register Display *dpy,
diff --git a/xc/lib/X11/LRGB.c b/xc/lib/X11/LRGB.c
index ec74cfbaf..cd37008f4 100644
--- a/xc/lib/X11/LRGB.c
+++ b/xc/lib/X11/LRGB.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XcmsLRGB.c,v 1.2 91/02/05 13:41:38 dave Exp $" */
+/* $XConsortium: XcmsLRGB.c,v 1.3 91/02/07 15:43:11 dave Exp $" */
 
 /*
  * (c) Copyright 1990 1991 Tektronix Inc.
diff --git a/xc/lib/X11/Lab.c b/xc/lib/X11/Lab.c
index 59677427d..ae54ffd0b 100644
--- a/xc/lib/X11/Lab.c
+++ b/xc/lib/X11/Lab.c
@@ -1,4 +1,4 @@
-/* $XConsortium: CIELab.c,v 1.2 91/02/05 13:40:43 dave Exp $ */
+/* $XConsortium: CIELab.c,v 1.3 91/02/07 15:42:52 dave Exp $ */
 
 /*
  * (c) Copyright 1990 1991 Tektronix Inc.
diff --git a/xc/lib/X11/LookupCol.c b/xc/lib/X11/LookupCol.c
index ffa68b62d..587f75b6d 100644
--- a/xc/lib/X11/LookupCol.c
+++ b/xc/lib/X11/LookupCol.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XLookupCol.c,v 11.11 91/01/06 11:46:52 rws Exp $ */
+/* $XConsortium: XLookupCol.c,v 11.12 91/02/05 13:40:36 dave Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -18,9 +18,6 @@ without express or implied warranty.
 #include "Xlibint.h"
 #include "TekCMS.h"
 
-
-extern XcmsCCC *XcmsCCCofColormap();
-
 #if NeedFunctionPrototypes
 Status XLookupColor (
 	register Display *dpy,
diff --git a/xc/lib/X11/ParseCol.c b/xc/lib/X11/ParseCol.c
index e5e6400c8..0975ad79d 100644
--- a/xc/lib/X11/ParseCol.c
+++ b/xc/lib/X11/ParseCol.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XParseCol.c,v 11.20 91/01/06 11:47:11 rws Exp $ */
+/* $XConsortium: XParseCol.c,v 11.21 91/02/05 13:40:28 dave Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -18,8 +18,6 @@ without express or implied warranty.
 #include "Xlibint.h"
 #include "TekCMS.h"
 
-extern XcmsCCC *XcmsCCCofColormap();
-
 #if NeedFunctionPrototypes
 Status XParseColor (
 	register Display *dpy,
diff --git a/xc/lib/X11/StCols.c b/xc/lib/X11/StCols.c
index bb6afba07..852f0d1be 100644
--- a/xc/lib/X11/StCols.c
+++ b/xc/lib/X11/StCols.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XcmsStCols.c,v 1.1 91/01/30 19:03:28 dave Exp $" */
+/* $XConsortium: XcmsStCols.c,v 1.2 91/02/07 15:43:17 dave Exp $" */
 
 /*
  * (c) Copyright 1989 1990 1991 Tektronix Inc.
diff --git a/xc/lib/X11/StNColor.c b/xc/lib/X11/StNColor.c
index 3c40839b2..20ca56626 100644
--- a/xc/lib/X11/StNColor.c
+++ b/xc/lib/X11/StNColor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XStNColor.c,v 11.14 91/02/05 13:40:30 dave Exp $ */
+/* $XConsortium: XStNColor.c,v 11.15 91/02/07 15:42:25 dave Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1986	*/
 
 /*
@@ -17,8 +17,6 @@ without express or implied warranty.
 #include "Xlibint.h"
 #include "TekCMS.h"
 
-extern XcmsCCC *XcmsCCCofColormap();
-
 #if NeedFunctionPrototypes
 XStoreNamedColor(
 register Display *dpy,
diff --git a/xc/lib/X11/cmsAllCol.c b/xc/lib/X11/cmsAllCol.c
index 9a641868d..11e33e3ab 100644
--- a/xc/lib/X11/cmsAllCol.c
+++ b/xc/lib/X11/cmsAllCol.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XcmsAllCol.c,v 1.7 91/01/27 00:36:20 alt Exp $" */
+/* $XConsortium: XcmsAllCol.c,v 1.1 91/01/30 18:30:26 dave Exp $" */
 
 /*
  * (c) Copyright 1989 1990 1991 Tektronix Inc.
@@ -38,13 +38,6 @@
 #include "Xlib.h"
 #include "TekCMS.h"
 
-
-/*
- *      EXTERNS
- */
-
-extern Status XAllocColor();
-
 
 /*
  *	NAME
diff --git a/xc/lib/X11/cmsAllNCol.c b/xc/lib/X11/cmsAllNCol.c
index ef9c74aab..5b3cd3d88 100644
--- a/xc/lib/X11/cmsAllNCol.c
+++ b/xc/lib/X11/cmsAllNCol.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XcmsAlNCol.c,v 1.15 91/01/27 00:36:13 alt Exp $" */
+/* $XConsortium: XcmsAlNCol.c,v 1.1 91/01/30 18:23:47 dave Exp $" */
 
 /*
  * (c) Copyright 1989 1990 1991 Tektronix Inc.
@@ -67,7 +67,7 @@ Status
 XcmsAllocNamedColor (
     Display *dpy,
     Colormap cmap,
-    const char *color_name,
+    _Xconst char *color_name,
     XcmsColor *pColor_scrn_return,
     XcmsColor *pColor_exact_return,
     XcmsSpecFmt result_format)
diff --git a/xc/lib/X11/cmsCmap.c b/xc/lib/X11/cmsCmap.c
index 605ad5043..370bd0e74 100644
--- a/xc/lib/X11/cmsCmap.c
+++ b/xc/lib/X11/cmsCmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XcmsCmap.c,v 1.2 91/02/05 13:41:25 dave Exp $" */
+/* $XConsortium: XcmsCmap.c,v 1.3 91/02/07 15:43:03 dave Exp $" */
 
 /*
  * (c) Copyright 1990 1991 Tektronix Inc.
@@ -48,11 +48,6 @@
 #include <X11/Xproto.h>
 
 /*
- *      EXTERNS
- */
-extern XcmsCCC *XcmsCreateCCC();
-
-/*
  *      FORWARD DECLARATIONS
  */
 XcmsCmapRec *_XcmsAddCmapRec();
diff --git a/xc/lib/X11/cmsColNm.c b/xc/lib/X11/cmsColNm.c
index 7c6d5e773..87b2cf97a 100644
--- a/xc/lib/X11/cmsColNm.c
+++ b/xc/lib/X11/cmsColNm.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XcmsColNm.c,v 1.2 91/02/05 13:41:28 dave Exp $" */
+/* $XConsortium: XcmsColNm.c,v 1.3 91/02/07 15:43:06 dave Exp $" */
 
 /*
  * (c) Copyright 1990 1991 Tektronix Inc.
@@ -678,7 +678,7 @@ XResolvePathname(dpy, type, filename, suffix, root, path, substitutions,
 Status
 _XcmsResolveColorString (
     XcmsCCC *pCCC,
-    const char *color_string,
+    _Xconst char *color_string,
     XcmsColor *pColor_exact_return,
     XcmsSpecFmt result_format)
 #else
diff --git a/xc/lib/X11/cmsLkCol.c b/xc/lib/X11/cmsLkCol.c
index d38fa951e..0a3aeab35 100644
--- a/xc/lib/X11/cmsLkCol.c
+++ b/xc/lib/X11/cmsLkCol.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XcmsLkCol.c,v 1.1 91/01/30 16:52:15 dave Exp $ */
+/* $XConsortium: XcmsLkCol.c,v 1.2 91/02/07 15:42:49 dave Exp $ */
 
 /*
  * (c) Copyright 1989 1990 1991 Tektronix Inc.
diff --git a/xc/lib/X11/cmsProp.c b/xc/lib/X11/cmsProp.c
index 9a6f091ec..7cbddeb2a 100644
--- a/xc/lib/X11/cmsProp.c
+++ b/xc/lib/X11/cmsProp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XcmsProp.c,v 1.2 91/02/05 13:41:44 dave Exp $" */
+/* $XConsortium: XcmsProp.c,v 1.3 91/02/07 15:43:14 dave Exp $" */
 
 /*
  * (c) Copyright 1990 1991 Tektronix Inc.
diff --git a/xc/lib/X11/uvY.c b/xc/lib/X11/uvY.c
index d166f93b1..d5a22f082 100644
--- a/xc/lib/X11/uvY.c
+++ b/xc/lib/X11/uvY.c
@@ -1,4 +1,4 @@
-/* $XConsortium: CIEuvY.c,v 1.2 91/02/05 13:40:49 dave Exp $" */
+/* $XConsortium: CIEuvY.c,v 1.3 91/02/07 15:42:54 dave Exp $" */
 
 /*
  * (c) Copyright 1990 1991 Tektronix Inc.
diff --git a/xc/lib/X11/xyY.c b/xc/lib/X11/xyY.c
index c2b6863f7..a2b7251d6 100644
--- a/xc/lib/X11/xyY.c
+++ b/xc/lib/X11/xyY.c
@@ -1,4 +1,4 @@
-/* $XConsortium: CIExyY.c,v 1.2 91/02/05 13:40:51 dave Exp $" */
+/* $XConsortium: CIExyY.c,v 1.3 91/02/07 15:42:57 dave Exp $" */
 
 /*
  * (c) Copyright 1990 1991 Tektronix Inc.