xfree86 merge

18 files changed, 0 insertions, 95 deletions

diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c
index 39e952a8..7d3a5cc4 100644
--- a/modules/im/ximcp/imDefIc.c
+++ b/modules/im/ximcp/imDefIc.c
@@ -34,11 +34,6 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "Xlcint.h"
 #include "Ximint.h"
 
-/* EXTERNS */
-
-/* imRm.c */
-extern Bool _XimCheckCreateICValues();
-
 Private Bool
 _XimCreateICCheck(
     Xim          im,
diff --git a/modules/im/ximcp/imThaiFlt.c b/modules/im/ximcp/imThaiFlt.c
index 3e57f145..b674b0d3 100644
--- a/modules/im/ximcp/imThaiFlt.c
+++ b/modules/im/ximcp/imThaiFlt.c
@@ -76,30 +76,6 @@ SOFTWARE.
 #include "XlcPubI.h"
 
 
-/* EXTERNS */
-/* KeyBind.c */
-extern int _XKeyInitialize();
-
-/* lcStd.c */
-extern int _Xlcmbstowcs(
-    XLCd	lcd,
-    wchar_t	*wstr,
-    char	*str,
-    int		len
-);
-extern int _Xlcwcstombs(
-    XLCd	lcd,
-    char	*str,
-    wchar_t	*wstr,
-    int		len
-);
-extern int _Xlcmbstoutf8(
-    XLCd	lcd,
-    char	*ustr,
-    const char	*str,
-    int		len
-);
-
 #define SPACE   32
 
 /* character classification table */
diff --git a/src/ChWAttrs.c b/src/ChWAttrs.c
index 54207d1e..f2c498c5 100644
--- a/src/ChWAttrs.c
+++ b/src/ChWAttrs.c
@@ -28,8 +28,6 @@ in this Software without prior written authorization from The Open Group.
 
 #include "Xlibint.h"
 
-extern void _XProcessWindowAttributes();
-
 #define AllMaskBits (CWBackPixmap|CWBackPixel|CWBorderPixmap|\
 		     CWBorderPixel|CWBitGravity|CWWinGravity|\
 		     CWBackingStore|CWBackingPlanes|CWBackingPixel|\
diff --git a/src/ClDisplay.c b/src/ClDisplay.c
index bb82da8c..e2a379aa 100644
--- a/src/ClDisplay.c
+++ b/src/ClDisplay.c
@@ -34,9 +34,6 @@ from The Open Group.
 #include "Xlibint.h"
 #include "Xintconn.h"
 
-/* ConnDis.c */
-extern int _XDisconnectDisplay();
-
 /* 
  * XCloseDisplay - XSync the connection to the X Server, close the connection,
  * and free all associated storage.  Extension close procs should only free
diff --git a/src/GetImage.c b/src/GetImage.c
index 3b6b4916..8b1224a3 100644
--- a/src/GetImage.c
+++ b/src/GetImage.c
@@ -31,10 +31,6 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xutil.h>		/* for XDestroyImage */
 #include "ImUtil.h"
 
-/* ImUtil.c */
-extern int _XGetScanlinePad();
-extern int _XSetImage();
-
 #define ROUNDUP(nbytes, pad) (((((nbytes) - 1) + (pad)) / (pad)) * (pad))
 
 static unsigned int Ones(                /* HACKMEM 169 */
diff --git a/src/xcms/CCC.c b/src/xcms/CCC.c
index 0ba9e084..c4e82820 100644
--- a/src/xcms/CCC.c
+++ b/src/xcms/CCC.c
@@ -68,12 +68,6 @@ from The Open Group.
 #include "Xcmsint.h"
 #include "Cv.h"
 
-/* cmsInt.c */
-extern int _XcmsInitDefaultCCCs();
-extern int _XcmsInitScrnInfo();
-
-
-
 
 
 /************************************************************************
diff --git a/src/xcms/CvColW.c b/src/xcms/CvColW.c
index e48c742e..2ba67f0c 100644
--- a/src/xcms/CvColW.c
+++ b/src/xcms/CvColW.c
@@ -39,12 +39,6 @@
 #include "Xcmsint.h"
 #include "Cv.h"
 
-/* EXTERNS */
-/* CvCols.c */
-extern Status _XcmsDDConvertColors();
-extern Status _XcmsDIConvertColors();
-
-
 
 /************************************************************************
  *									*
diff --git a/src/xcms/LabGcC.c b/src/xcms/LabGcC.c
index daa0d6e1..c13397a4 100644
--- a/src/xcms/LabGcC.c
+++ b/src/xcms/LabGcC.c
@@ -36,8 +36,6 @@
 #include "Xcmsint.h"
 #include "Cv.h"
 
-extern Status _XcmsDIConvertColors();
-
 
 /************************************************************************
  *									*
diff --git a/src/xcms/LabGcL.c b/src/xcms/LabGcL.c
index 2e656226..aac8d23e 100644
--- a/src/xcms/LabGcL.c
+++ b/src/xcms/LabGcL.c
@@ -36,9 +36,6 @@
 #include "Xcmsint.h"
 #include "Cv.h"
 
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
 
 /************************************************************************
  *									*
diff --git a/src/xcms/Luv.c b/src/xcms/Luv.c
index f9227659..8d149478 100644
--- a/src/xcms/Luv.c
+++ b/src/xcms/Luv.c
@@ -47,12 +47,6 @@
 
 #include <stdio.h> /* sscanf */
 
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
-/* uvY.c */
-Status _XcmsCIEuvY_ValidSpec();
-
 
 /*
  *	FORWARD DECLARATIONS
diff --git a/src/xcms/LuvGcC.c b/src/xcms/LuvGcC.c
index 2b61db90..fdb5dcd2 100644
--- a/src/xcms/LuvGcC.c
+++ b/src/xcms/LuvGcC.c
@@ -36,11 +36,6 @@
 #include "Xcmsint.h"
 #include "Cv.h"
 
-/* EXTERNS */
-
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
 
 /************************************************************************
  *									*
diff --git a/src/xcms/LuvGcL.c b/src/xcms/LuvGcL.c
index 3181f490..1c9d4f5a 100644
--- a/src/xcms/LuvGcL.c
+++ b/src/xcms/LuvGcL.c
@@ -36,9 +36,6 @@
 #include "Xcmsint.h"
 #include "Cv.h"
 
-/* CvCols.c */
-extern Status _XcmsDIConvertColors();
-
 
 /************************************************************************
  *									*
diff --git a/src/xcms/LuvMxC.c b/src/xcms/LuvMxC.c
index 6d3c2509..10088bbe 100644
--- a/src/xcms/LuvMxC.c
+++ b/src/xcms/LuvMxC.c
@@ -48,9 +48,6 @@
 #define START_CHROMA	(XcmsFloat)2.2
 #define TOPL		(XcmsFloat)100.0
 
-/* CvColW.c */
-extern Status _XcmsConvertColorsWithWhitePt();
-
 
 /************************************************************************
  *									*
diff --git a/src/xcms/QuCols.c b/src/xcms/QuCols.c
index 2e550af9..f2ca1a28 100644
--- a/src/xcms/QuCols.c
+++ b/src/xcms/QuCols.c
@@ -38,11 +38,6 @@
 #include "Xcmsint.h"
 #include "Cv.h"
 
-/* EXTERNS */
-
-/* SetGetCols.c */
-extern Status _XcmsSetGetColors();
-
 
 /************************************************************************
  *									*
diff --git a/src/xcms/StCol.c b/src/xcms/StCol.c
index 6e952fc5..0d845b90 100644
--- a/src/xcms/StCol.c
+++ b/src/xcms/StCol.c
@@ -38,11 +38,6 @@
 #include "Xcmsint.h"
 #include "Cv.h"
 
-/* EXTERN */
-
-/* SetGetCols.c */
-extern Status _XcmsSetGetColors();
-
 
 /************************************************************************
  *									*
diff --git a/src/xcms/StCols.c b/src/xcms/StCols.c
index 03389a7e..3d6b9004 100644
--- a/src/xcms/StCols.c
+++ b/src/xcms/StCols.c
@@ -38,11 +38,6 @@
 #include "Xcmsint.h"
 #include "Cv.h"
 
-/* EXTERN */
-
-/* SetGetCols.c */
-extern Status _XcmsSetGetColors();
-
 
 /************************************************************************
  *									*
diff --git a/src/xcms/cmsAllCol.c b/src/xcms/cmsAllCol.c
index 18636c00..0bdeeeb7 100644
--- a/src/xcms/cmsAllCol.c
+++ b/src/xcms/cmsAllCol.c
@@ -38,11 +38,6 @@
 #include "Xcmsint.h"
 #include "Cv.h"
 
-/* EXTERNS */
-
-/* SetGetCols.c */
-extern Status _XcmsSetGetColors();
-
 
 /*
  *	NAME
diff --git a/src/xcms/cmsAllNCol.c b/src/xcms/cmsAllNCol.c
index 8b0e721b..ffcb9df3 100644
--- a/src/xcms/cmsAllNCol.c
+++ b/src/xcms/cmsAllNCol.c
@@ -40,9 +40,6 @@
 #include "Xcmsint.h"
 #include "Cv.h"
 
-/* cmsColNm.c */
-extern Status _XcmsResolveColorString();
-
 
 /*
  *	NAME