Fix build on gcc-3.3.x

Submitted by:   Simon Barner <barner@in.tum.de>

31 files changed, 365 insertions, 8 deletions

diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index a92f386ade83..c0accc9d490a 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -23,10 +23,6 @@ USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s,-O3 -Wall -Werror,${CXXFLAGS},g ; \
 		s,gtk-config,${GTK_CONFIG},g ; \
diff --git a/graphics/gsculpt/files/patch-Makefile b/graphics/gsculpt/files/patch-Makefile
new file mode 100644
index 000000000000..7612dd4ea61f
--- /dev/null
+++ b/graphics/gsculpt/files/patch-Makefile
@@ -0,0 +1,27 @@
+--- Makefile.orig	Mon Jul 21 19:59:12 2003
++++ Makefile	Mon Jul 21 19:59:38 2003
+@@ -27,7 +27,6 @@
+ 
+ # C
+ 
+-CC     := gcc
+ CFLAGS  = ${DEPENDFLAGS}
+ 
+ %.o : %.c
+@@ -35,7 +34,6 @@
+ 
+ # C++
+ 
+-CXX      := g++
+ CXXFLAGS  = ${DEPENDFLAGS}
+ 
+ %.o : %.cc
+@@ -57,7 +55,7 @@
+ 
+ # linker
+ 
+-LINKER    := g++
++LINKER    := ${CXX}
+ LDFLAGS    = 
+ LOADLIBES := -O3 -lm `gtk-config --libs`
+ 
diff --git a/graphics/gsculpt/files/patch-src::Edges::CEdgeContainer.h b/graphics/gsculpt/files/patch-src::Edges::CEdgeContainer.h
new file mode 100644
index 000000000000..41590d53b6dd
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Edges::CEdgeContainer.h
@@ -0,0 +1,10 @@
+--- ./src/Edges/CEdgeContainer.h.orig	Mon Jul 21 18:32:59 2003
++++ ./src/Edges/CEdgeContainer.h	Mon Jul 21 18:33:24 2003
+@@ -13,6 +13,7 @@
+ 
+ #include "CEdge.h"
+ 
++using std::set;
+ 
+ /*
+ *******************************************************************************
diff --git a/graphics/gsculpt/files/patch-src::Editor::StatusBar.h b/graphics/gsculpt/files/patch-src::Editor::StatusBar.h
new file mode 100644
index 000000000000..05288044f863
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Editor::StatusBar.h
@@ -0,0 +1,11 @@
+--- ./src/Editor/StatusBar.h.orig	Mon Jul 21 16:36:37 2003
++++ ./src/Editor/StatusBar.h	Mon Jul 21 16:36:49 2003
+@@ -9,7 +9,7 @@
+ 
+ #include <gtk/gtkwidget.h>
+ 
+-
++using std::string;
+ 
+ class StatusBar
+ {
diff --git a/graphics/gsculpt/files/patch-src::Editor::Toolbox.h b/graphics/gsculpt/files/patch-src::Editor::Toolbox.h
new file mode 100644
index 000000000000..9912d16916b8
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Editor::Toolbox.h
@@ -0,0 +1,11 @@
+--- ./src/Editor/Toolbox.h.orig	Mon Jul 21 18:37:37 2003
++++ ./src/Editor/Toolbox.h	Mon Jul 21 18:37:46 2003
+@@ -13,7 +13,7 @@
+ 
+ #include <gtk/gtkwidget.h>
+ 
+-
++using std::string;
+ 
+ class Toolbox
+ {
diff --git a/graphics/gsculpt/files/patch-src::Events::Event.h b/graphics/gsculpt/files/patch-src::Events::Event.h
new file mode 100644
index 000000000000..e79de7bc1ecd
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Events::Event.h
@@ -0,0 +1,11 @@
+--- ./src/Events/Event.h.orig	Mon Jul 21 16:31:20 2003
++++ ./src/Events/Event.h	Mon Jul 21 16:31:32 2003
+@@ -10,7 +10,7 @@
+ #define EVENTH
+ 
+ #include <string>
+-
++using std::string;
+ 
+ 
+ 
diff --git a/graphics/gsculpt/files/patch-src::Faces::CFace.h b/graphics/gsculpt/files/patch-src::Faces::CFace.h
new file mode 100644
index 000000000000..24f6eb5e486a
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Faces::CFace.h
@@ -0,0 +1,10 @@
+--- ./src/Faces/CFace.h.orig	Mon Jul 21 18:33:51 2003
++++ ./src/Faces/CFace.h	Mon Jul 21 18:34:02 2003
+@@ -17,6 +17,7 @@
+ 
+ #include "Point3.h"
+ 
++using std::vector;
+ 
+ /*
+ *******************************************************************************
diff --git a/graphics/gsculpt/files/patch-src::FileIO::fileio.h b/graphics/gsculpt/files/patch-src::FileIO::fileio.h
new file mode 100644
index 000000000000..3c0ad908547f
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::FileIO::fileio.h
@@ -0,0 +1,11 @@
+--- ./src/FileIO/fileio.h.orig	Mon Jul 21 16:28:28 2003
++++ ./src/FileIO/fileio.h	Mon Jul 21 16:28:40 2003
+@@ -8,7 +8,7 @@
+ #include <stdio.h>
+ 
+ #include <string>
+-
++using std::string;
+ 
+ string readString(FILE *f);
+ void writeString(FILE *f, const string& s);
diff --git a/graphics/gsculpt/files/patch-src::Journal::JournalTaskProgress.h b/graphics/gsculpt/files/patch-src::Journal::JournalTaskProgress.h
new file mode 100644
index 000000000000..572aeed90b74
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Journal::JournalTaskProgress.h
@@ -0,0 +1,11 @@
+--- ./src/Journal/JournalTaskProgress.h.orig	Mon Jul 21 16:38:59 2003
++++ ./src/Journal/JournalTaskProgress.h	Mon Jul 21 16:39:09 2003
+@@ -10,7 +10,7 @@
+ 
+ #include "MultiThreading.h"
+ 
+-
++using std::string;
+ 
+ 
+ class JournalTaskProgress
diff --git a/graphics/gsculpt/files/patch-src::LogGrid::CGrid.h b/graphics/gsculpt/files/patch-src::LogGrid::CGrid.h
new file mode 100644
index 000000000000..409b3b140a35
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::LogGrid::CGrid.h
@@ -0,0 +1,11 @@
+--- ./src/LogGrid/CGrid.h.orig	Mon Jul 21 16:32:01 2003
++++ ./src/LogGrid/CGrid.h	Mon Jul 21 16:32:11 2003
+@@ -6,7 +6,7 @@
+ #define CGRIDH

+ 

+ #include <list>

+-

++using std::list;

+ 

+ #include "array.h"

+ 

diff --git a/graphics/gsculpt/files/patch-src::Math::BBox.h b/graphics/gsculpt/files/patch-src::Math::BBox.h
new file mode 100644
index 000000000000..2747163d10ab
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Math::BBox.h
@@ -0,0 +1,10 @@
+--- ./src/Math/BBox.h.orig	Mon Jul 21 16:29:27 2003
++++ ./src/Math/BBox.h	Mon Jul 21 16:30:21 2003
+@@ -12,6 +12,7 @@
+ #include "Point3.h"

+ #include "Plane.h"

+ #include "Line3.h"

++using std::vector;
+ 

+ 

+ 

diff --git a/graphics/gsculpt/files/patch-src::Model::CModel.cpp b/graphics/gsculpt/files/patch-src::Model::CModel.cpp
new file mode 100644
index 000000000000..9461fdb76ae4
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Model::CModel.cpp
@@ -0,0 +1,23 @@
+--- ./src/Model/CModel.cpp.orig	Mon Jul 21 18:40:40 2003
++++ ./src/Model/CModel.cpp	Mon Jul 21 18:41:05 2003
+@@ -68,17 +68,17 @@
+ }
+ 
+ 
+-BBox CModel::getBBox(bool selectedOnly = true) const
++BBox CModel::getBBox(bool selectedOnly) const
+ {
+ 	return BBox();
+ }
+ 
+-BBox CModel::getBBox(const Matrix4& m, bool selectedOnly = true) const
++BBox CModel::getBBox(const Matrix4& m, bool selectedOnly) const
+ {
+ 	return BBox();
+ }
+ 
+-BBox CModel::getBBox(const Transformation *x, bool selectedOnly = true) const
++BBox CModel::getBBox(const Transformation *x, bool selectedOnly) const
+ {
+ 	return BBox();
+ }
diff --git a/graphics/gsculpt/files/patch-src::ObjEdit::ObjectCollection.cpp b/graphics/gsculpt/files/patch-src::ObjEdit::ObjectCollection.cpp
new file mode 100644
index 000000000000..e24a6a1585f0
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::ObjEdit::ObjectCollection.cpp
@@ -0,0 +1,19 @@
+--- ./src/ObjEdit/ObjectCollection.cpp.orig	Mon Jul 21 18:47:55 2003
++++ ./src/ObjEdit/ObjectCollection.cpp	Mon Jul 21 19:44:26 2003
+@@ -326,11 +326,14 @@
+ UniqueId ObjectCollection::getUniqueId(const string& name) const
+ {
+ 	IdTable::const_iterator iter = nameToId.find(name);
+-	if ( iter != objects.end() )
++
++	//if (iter != objects.end() )
++	// Is this correct? 21.7.03, barner@in.tum.de
++	if (iter != nameToId.end())
+ 	{
+ 		return (*iter).second;
+ 	}
+-	else
++	else 
+ 	{
+ 		return -1;
+ 	}
diff --git a/graphics/gsculpt/files/patch-src::ObjEdit::ObjectCollection.h b/graphics/gsculpt/files/patch-src::ObjEdit::ObjectCollection.h
new file mode 100644
index 000000000000..055cced048fb
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::ObjEdit::ObjectCollection.h
@@ -0,0 +1,14 @@
+--- ./src/ObjEdit/ObjectCollection.h.orig	Mon Jul 21 18:43:57 2003
++++ ./src/ObjEdit/ObjectCollection.h	Mon Jul 21 18:47:09 2003
+@@ -23,7 +23,10 @@
+ #include "Journal.h"
+ #include "ListManager.h"
+ 
+-
++using std::string;
++using std::map;
++using std::set;
++using std::list;
+ 
+ 
+ class ObjectCollection : public JournalCollection
diff --git a/graphics/gsculpt/files/patch-src::Patch::Patch.h b/graphics/gsculpt/files/patch-src::Patch::Patch.h
new file mode 100644
index 000000000000..8ce79f8fc67b
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Patch::Patch.h
@@ -0,0 +1,11 @@
+--- ./src/Patch/Patch.h.orig	Mon Jul 21 16:20:46 2003
++++ ./src/Patch/Patch.h	Mon Jul 21 16:27:54 2003
+@@ -7,6 +7,8 @@
+ 
+ #include <vector>
+ 
++using std::vector;
++
+ //generates the indices of the vertices which make up quadrilateral faces, which
+ //form a rectangular patch
+ void patchGenerateQuadList(vector<int>& quads, int widthFaces, int heightFaces,
diff --git a/graphics/gsculpt/files/patch-src::PolylineTools::ToolPolyDraw.cpp b/graphics/gsculpt/files/patch-src::PolylineTools::ToolPolyDraw.cpp
new file mode 100644
index 000000000000..be37e1b412fc
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::PolylineTools::ToolPolyDraw.cpp
@@ -0,0 +1,11 @@
+--- ./src/PolylineTools/ToolPolyDraw.cpp.orig	Mon Jul 21 19:13:35 2003
++++ ./src/PolylineTools/ToolPolyDraw.cpp	Mon Jul 21 19:14:06 2003
+@@ -27,7 +27,7 @@
+ 
+ #include "Point3.h"
+ 
+-
++using std::ostrstream;
+ 
+ 
+ 
diff --git a/graphics/gsculpt/files/patch-src::SelectTools::ToolSelectBase.cpp b/graphics/gsculpt/files/patch-src::SelectTools::ToolSelectBase.cpp
new file mode 100644
index 000000000000..bd87ff642e51
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::SelectTools::ToolSelectBase.cpp
@@ -0,0 +1,11 @@
+--- ./src/SelectTools/ToolSelectBase.cpp.orig	Mon Jul 21 19:10:28 2003
++++ ./src/SelectTools/ToolSelectBase.cpp	Mon Jul 21 19:11:17 2003
+@@ -146,7 +146,7 @@
+ ToolSelectBase::ToolSelectBase( CadView *v,
+ 										  ObjPainterManager *pman,
+ 										  const string& funcName, const string& optTitle,
+-										  int tableWidth = 1 )
++										  int tableWidth )
+ 				: ToolSelectModel( v, pman, funcName, optTitle, tableWidth ),
+ 				  CadClickAndDragEventHandler( v->getCadArea() )
+ {
diff --git a/graphics/gsculpt/files/patch-src::Tools::ToolGroup.h b/graphics/gsculpt/files/patch-src::Tools::ToolGroup.h
new file mode 100644
index 000000000000..b75f2d3f945a
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Tools::ToolGroup.h
@@ -0,0 +1,12 @@
+--- ./src/Tools/ToolGroup.h.orig	Mon Jul 21 18:34:42 2003
++++ ./src/Tools/ToolGroup.h	Mon Jul 21 18:34:57 2003
+@@ -13,7 +13,8 @@
+ 
+ #include "GridLayout.h"
+ 
+-
++using std::vector;
++using std::string;
+ 
+ class ToolGroup
+ {
diff --git a/graphics/gsculpt/files/patch-src::Tools::Toolset.h b/graphics/gsculpt/files/patch-src::Tools::Toolset.h
new file mode 100644
index 000000000000..709d10b6d9cf
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Tools::Toolset.h
@@ -0,0 +1,12 @@
+--- ./src/Tools/Toolset.h.orig	Mon Jul 21 16:35:45 2003
++++ ./src/Tools/Toolset.h	Mon Jul 21 16:36:04 2003
+@@ -18,7 +18,8 @@
+ #include "CadView.h"
+ #include "Toolbox.h"
+ 
+-
++using std::string;
++using std::vector;
+ 
+ class Toolset
+ {
diff --git a/graphics/gsculpt/files/patch-src::TypeManager::TypeManager.h b/graphics/gsculpt/files/patch-src::TypeManager::TypeManager.h
new file mode 100644
index 000000000000..bf9f4ed1f66f
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::TypeManager::TypeManager.h
@@ -0,0 +1,14 @@
+--- ./src/TypeManager/TypeManager.h.orig	Mon Jul 21 16:37:26 2003
++++ ./src/TypeManager/TypeManager.h	Mon Jul 21 16:38:08 2003
+@@ -10,7 +10,10 @@
+ #include <map>
+ #include <list>
+ 
+-
++using std::string;
++using std::vector;
++using std::map;
++using std::list;
+ 
+ 
+ 
diff --git a/graphics/gsculpt/files/patch-src::Widgets::ListManager.cpp b/graphics/gsculpt/files/patch-src::Widgets::ListManager.cpp
new file mode 100644
index 000000000000..0853e22d52a6
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Widgets::ListManager.cpp
@@ -0,0 +1,11 @@
+--- ./src/Widgets/ListManager.cpp.orig	Mon Jul 21 19:25:18 2003
++++ ./src/Widgets/ListManager.cpp	Mon Jul 21 19:25:30 2003
+@@ -10,7 +10,7 @@
+ 
+ #include "ListManager.h"
+ 
+-
++using std::set;
+ 
+ 
+ ListManager::ListManager(const string& columnTitle)
diff --git a/graphics/gsculpt/files/patch-src::Widgets::ListManager.h b/graphics/gsculpt/files/patch-src::Widgets::ListManager.h
new file mode 100644
index 000000000000..2b6e18dcb64c
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Widgets::ListManager.h
@@ -0,0 +1,12 @@
+--- ./src/Widgets/ListManager.h.orig	Mon Jul 21 18:41:55 2003
++++ ./src/Widgets/ListManager.h	Mon Jul 21 18:43:28 2003
+@@ -14,7 +14,8 @@
+ 
+ #include <gtk/gtkwidget.h>
+ 
+-
++using std::multiset;
++using std::string;
+ 
+ 
+ class ListManager
diff --git a/graphics/gsculpt/files/patch-src::Widgets::NameDialog.cpp b/graphics/gsculpt/files/patch-src::Widgets::NameDialog.cpp
new file mode 100644
index 000000000000..ccd764ccb191
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Widgets::NameDialog.cpp
@@ -0,0 +1,13 @@
+--- ./src/Widgets/NameDialog.cpp.orig	Mon Jul 21 19:27:45 2003
++++ ./src/Widgets/NameDialog.cpp	Mon Jul 21 19:28:18 2003
+@@ -44,8 +44,8 @@
+ }
+ 
+ NameDialog::NameDialog(NameDialogListener *l,
+-							  const string& title = "Name",
+-							  const string& prompt = "name:")
++							  const string& title,
++							  const string& prompt )
+ {
+ 	listener = l;
+ 	constructorCommon(title, prompt);
diff --git a/graphics/gsculpt/files/patch-src::Widgets::NameDialog.h b/graphics/gsculpt/files/patch-src::Widgets::NameDialog.h
new file mode 100644
index 000000000000..989200a7a9e9
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Widgets::NameDialog.h
@@ -0,0 +1,11 @@
+--- ./src/Widgets/NameDialog.h.orig	Mon Jul 21 19:26:12 2003
++++ ./src/Widgets/NameDialog.h	Mon Jul 21 19:26:22 2003
+@@ -15,7 +15,7 @@
+ 
+ #include "callback.h"
+ 
+-
++using std::string;
+ 
+ 
+ class NameDialog;
diff --git a/graphics/gsculpt/files/patch-src::Widgets::VectorWidget.cpp b/graphics/gsculpt/files/patch-src::Widgets::VectorWidget.cpp
new file mode 100644
index 000000000000..b14e44baeb92
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Widgets::VectorWidget.cpp
@@ -0,0 +1,12 @@
+--- ./src/Widgets/VectorWidget.cpp.orig	Mon Jul 21 19:22:12 2003
++++ ./src/Widgets/VectorWidget.cpp	Mon Jul 21 19:23:30 2003
+@@ -13,7 +13,8 @@
+ 
+ #include "VectorWidget.h"
+ 
+-
++using std::ostrstream;
++using std::istrstream;
+ 
+ /*
+ *******************************************************************************
diff --git a/graphics/gsculpt/files/patch-src::Widgets::messageBox.h b/graphics/gsculpt/files/patch-src::Widgets::messageBox.h
new file mode 100644
index 000000000000..3629cf8696ee
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Widgets::messageBox.h
@@ -0,0 +1,12 @@
+--- ./src/Widgets/messageBox.h.orig	Mon Jul 21 18:59:01 2003
++++ ./src/Widgets/messageBox.h	Mon Jul 21 18:59:17 2003
+@@ -8,7 +8,8 @@
+ #include <string>
+ #include <vector>
+ 
+-
++using std::string;
++using std::vector;
+ 
+ /*
+ *******************************************************************************
diff --git a/graphics/gsculpt/files/patch-src::WorkArea::CAEH_grid.cpp b/graphics/gsculpt/files/patch-src::WorkArea::CAEH_grid.cpp
new file mode 100644
index 000000000000..8d642da37c3e
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::WorkArea::CAEH_grid.cpp
@@ -0,0 +1,11 @@
+--- ./src/WorkArea/CAEH_grid.cpp.orig	Mon Jul 21 16:34:35 2003
++++ ./src/WorkArea/CAEH_grid.cpp	Mon Jul 21 16:34:54 2003
+@@ -8,7 +8,7 @@
+ #include "CAEH_grid.h"
+ 
+ #include <strstream>
+-
++using std::ostrstream;
+ 
+ 
+ CAEH_grid::CAEH_grid(CadArea *c, const CGrid& gr)
diff --git a/graphics/gsculpt/files/patch-src::WorkArea::DrawingArea.h b/graphics/gsculpt/files/patch-src::WorkArea::DrawingArea.h
new file mode 100644
index 000000000000..a89c2964d3f3
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::WorkArea::DrawingArea.h
@@ -0,0 +1,11 @@
+--- ./src/WorkArea/DrawingArea.h.orig	Mon Jul 21 16:32:55 2003
++++ ./src/WorkArea/DrawingArea.h	Mon Jul 21 16:33:25 2003
+@@ -27,7 +27,7 @@
+ #include "Geometry.h"
+ #include "PointerStatus.h"
+ 
+-
++using std::list;
+ 
+ /******************************************************************************
+  ******************************************************************************
diff --git a/graphics/gsculpt/files/patch-src::XformTools::ToolTransformModel.cpp b/graphics/gsculpt/files/patch-src::XformTools::ToolTransformModel.cpp
new file mode 100644
index 000000000000..681ce650e0f4
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::XformTools::ToolTransformModel.cpp
@@ -0,0 +1,11 @@
+--- ./src/XformTools/ToolTransformModel.cpp.orig	Mon Jul 21 19:05:58 2003
++++ ./src/XformTools/ToolTransformModel.cpp	Mon Jul 21 19:06:20 2003
+@@ -15,7 +15,7 @@
+ 													ObjPainterManager *pman,
+ 													const string& funcName,
+ 													const string& optTitle,
+-													int tableWidth = 1)
++													int tableWidth)
+ 					: ToolModifyModel(v, pman, funcName, optTitle, tableWidth)
+ {
+ }
diff --git a/graphics/xmms-gforce/Makefile b/graphics/xmms-gforce/Makefile
index c63ada8cafae..10d04f63b8cc 100644
--- a/graphics/xmms-gforce/Makefile
+++ b/graphics/xmms-gforce/Makefile
@@ -25,10 +25,6 @@ RESTRICTED=	"Non-commercial use only"
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 .if defined(WANT_DGA)
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	gforce-1.1.6xp3.dga.patch.gz
diff --git a/graphics/xmms-gforce/files/patch-_Unix-X::libxpce::xvhandler.c b/graphics/xmms-gforce/files/patch-_Unix-X::libxpce::xvhandler.c
new file mode 100644
index 000000000000..8a07bc98529b
--- /dev/null
+++ b/graphics/xmms-gforce/files/patch-_Unix-X::libxpce::xvhandler.c
@@ -0,0 +1,11 @@
+--- _Unix-X/libxpce/xvhandler.c.orig	Thu Jul 24 03:04:02 2003
++++ _Unix-X/libxpce/xvhandler.c	Thu Jul 24 03:04:12 2003
+@@ -342,7 +342,7 @@
+ 
+ /* x_DCTCEDoComp() - Do one component for DCTCE */
+ int x_DCTCEDoComp(int mask, int color) {
+-  static const char cnames[] = { "red", "green", "blue" };
++  static const char *cnames[] = { "red", "green", "blue" };
+   static const char cflags[] = { DoRed, DoGreen, DoBlue }; 
+   static unsigned long int * const carrays[] = { X_redmap, 
+ 						 X_greenmap,