Remove remaining K&R style prototypes.

92 files changed, 128 insertions, 1186 deletions

diff --git a/src/graph/include/Gfun.H1 b/src/graph/include/Gfun.H1
index 9c612fc4..081ccda2 100644
--- a/src/graph/include/Gfun.H1
+++ b/src/graph/include/Gfun.H1
@@ -1,43 +1,3 @@
-#ifdef _NO_PROTO
-extern int PSCreateFile();
-extern int Gdraws_drawFrame();
-extern int Gdraws_setDimension();
-extern int GDrawImageString();
-extern int GDrawArc();
-extern int GDrawLine();
-extern int GDrawLines();
-extern int GDrawPoint();
-extern int GDrawString();
-extern int GFillArc();
-extern int PSGlobalInit();
-extern int PSInit();
-extern int PSCreateContext();
-extern char * PSfindGC();
-extern int GSetForeground();
-extern int GSetBackground();
-extern int GSetLineAttributes();
-extern int PSClose();
-extern int centerX();
-extern int centerY();
-extern int PSColorPolygon();
-extern int PSColorwOutline();
-extern int PSDrawColor();
-extern int PSFillPolygon();
-extern int PSFillwOutline();
-extern HashTable * XCreateAssocTable();
-extern void XMakeAssoc();
-extern int * XLookUpAssoc();
-extern void XDeleteAssoc();
-extern int GDrawRectangle();
-extern int GDraw3DButtonOut();
-extern int GDraw3DButtonIn();
-extern int GDrawPushButton();
-#ifdef _GFUN_C
-static void filecopy();
-static int TrivEqual();
-static int TrivHash_code();
-#endif
-#else
 extern int PSCreateFile(int , Window , Window , char * );
 extern int Gdraws_drawFrame(int , Window , Window , char * );
 extern int Gdraws_setDimension(Window , Window );
@@ -76,4 +36,4 @@ static void filecopy(FILE * , FILE * );
 static int TrivEqual(Window , Window );
 static int TrivHash_code(Window , int );
 #endif
-#endif
+
diff --git a/src/graph/include/buttons2d.H1 b/src/graph/include/buttons2d.H1
index 12e64992..d58252ab 100644
--- a/src/graph/include/buttons2d.H1
+++ b/src/graph/include/buttons2d.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern int initButtons();
-#else
 extern int initButtons(buttonStruct * );
-#endif
+
diff --git a/src/graph/include/buttons3d.H1 b/src/graph/include/buttons3d.H1
index 12e64992..d58252ab 100644
--- a/src/graph/include/buttons3d.H1
+++ b/src/graph/include/buttons3d.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern int initButtons();
-#else
 extern int initButtons(buttonStruct * );
-#endif
+
diff --git a/src/graph/include/cleanup.H1 b/src/graph/include/cleanup.H1
index bd78e7a4..fc8c544e 100644
--- a/src/graph/include/cleanup.H1
+++ b/src/graph/include/cleanup.H1
@@ -1,13 +1,6 @@
-#ifdef _NO_PROTO
-extern void brokenPipe();
-extern void endChild();
-extern void rmViewMgr();
-extern void closeChildViewport();
-extern void goodbye();
-#else
 extern void brokenPipe(int sig);
 extern void endChild(int sig);
 extern void rmViewMgr(viewManager * slotPtr);
 extern void closeChildViewport(viewManager * slotPtr);
 extern void goodbye(int sig);
-#endif
+
diff --git a/src/graph/include/closeView3d.H1 b/src/graph/include/closeView3d.H1
index 7f90c596..6d08f370 100644
--- a/src/graph/include/closeView3d.H1
+++ b/src/graph/include/closeView3d.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern void closeViewport();
-#else
 extern void closeViewport(void);
-#endif
+
diff --git a/src/graph/include/component3d.H1 b/src/graph/include/component3d.H1
index eccc3a0c..1b3330b9 100644
--- a/src/graph/include/component3d.H1
+++ b/src/graph/include/component3d.H1
@@ -1,12 +1,3 @@
-#ifdef _NO_PROTO
-extern void scaleComponents();
-extern void makeTriangle();
-extern void triangulate();
-extern void readComponentsFromViewman();
-extern void calcNormData();
-extern viewPoints * make3DComponents();
-extern void draw3DComponents();
-#else
 extern void scaleComponents(void);
 extern void makeTriangle(int  , int  , int );
 extern void triangulate(void);
@@ -14,4 +5,4 @@ extern void readComponentsFromViewman(void);
 extern void calcNormData(void);
 extern viewPoints * make3DComponents(void);
 extern void draw3DComponents(int );
-#endif
+
diff --git a/src/graph/include/control2d.H1 b/src/graph/include/control2d.H1
index 69aad119..d1043caf 100644
--- a/src/graph/include/control2d.H1
+++ b/src/graph/include/control2d.H1
@@ -1,13 +1,3 @@
-#ifdef _NO_PROTO
-extern void writeControlTitle();
-extern void makeMessageFromData();
-extern void writeControlMessage();
-extern void drawControlPanel();
-extern controlXY getControlXY();
-extern controlPanelStruct * makeControlPanel();
-extern void putControlPanelSomewhere();
-extern void clearControlMessage();
-#else
 extern void writeControlTitle(void );
 extern void makeMessageFromData(int );
 extern void writeControlMessage(void );
@@ -16,4 +6,4 @@ extern controlXY getControlXY(int );
 extern controlPanelStruct * makeControlPanel(void );
 extern void putControlPanelSomewhere(int );
 extern void clearControlMessage(void );
-#endif
+
diff --git a/src/graph/include/control3d.H1 b/src/graph/include/control3d.H1
index ae8584e8..23385cf2 100644
--- a/src/graph/include/control3d.H1
+++ b/src/graph/include/control3d.H1
@@ -1,13 +1,3 @@
-#ifdef _NO_PROTO
-extern void drawColorMap();
-extern void writeControlTitle();
-extern void clearControlMessage();
-extern void writeControlMessage();
-extern void drawControlPanel();
-extern controlXY getControlXY();
-extern controlPanelStruct * makeControlPanel();
-extern void putControlPanelSomewhere();
-#else
 extern void drawColorMap(void);
 extern void writeControlTitle(Window );
 extern void clearControlMessage(void);
@@ -16,4 +6,4 @@ extern void drawControlPanel(void);
 extern controlXY getControlXY(int );
 extern controlPanelStruct * makeControlPanel(void);
 extern void putControlPanelSomewhere(int );
-#endif
+
diff --git a/src/graph/include/fun2D.H1 b/src/graph/include/fun2D.H1
index dae11b59..79bab0c7 100644
--- a/src/graph/include/fun2D.H1
+++ b/src/graph/include/fun2D.H1
@@ -1,9 +1,4 @@
-#ifdef _NO_PROTO
-extern void funView2D();
-extern void sendGraphToView2D();
-extern void forkView2D();
-#else
 extern void funView2D(int viewCommand);
 extern void sendGraphToView2D(int i ,int there,viewManager * viewType,graphStateStruct * doGraphStateArray);
 extern void forkView2D(void);
-#endif
+
diff --git a/src/graph/include/fun3D.H1 b/src/graph/include/fun3D.H1
index ada7b475..e70ee52d 100644
--- a/src/graph/include/fun3D.H1
+++ b/src/graph/include/fun3D.H1
@@ -1,7 +1,3 @@
-#ifdef _NO_PROTO
-extern void funView3D();
-extern void forkView3D();
-#else
 extern void funView3D(int viewCommand);
 extern void forkView3D(int typeOfViewport);
-#endif
+
diff --git a/src/graph/include/graph2d.H1 b/src/graph/include/graph2d.H1
index 2d5888d8..843fca29 100644
--- a/src/graph/include/graph2d.H1
+++ b/src/graph/include/graph2d.H1
@@ -1,7 +1,3 @@
-#ifdef _NO_PROTO
-extern void getGraphFromViewman();
-extern void freeGraph();
-#else
 extern void getGraphFromViewman(int );
 extern void freeGraph(int );
-#endif
+
diff --git a/src/graph/include/illuminate3d.H1 b/src/graph/include/illuminate3d.H1
index 80b7c05f..3828e085 100644
--- a/src/graph/include/illuminate3d.H1
+++ b/src/graph/include/illuminate3d.H1
@@ -1,13 +1,6 @@
-#ifdef _NO_PROTO
-extern float phong();
-extern int hueValue();
-extern int getHue();
-extern float Value();
-extern RGB hlsTOrgb();
-#else
 extern float phong(triple  , float [3]);
 extern int hueValue(float );
 extern int getHue(float );
 extern float Value(float  , float  , float );
 extern RGB hlsTOrgb(float  , float  , float );
-#endif
+
diff --git a/src/graph/include/lightbut3d.H1 b/src/graph/include/lightbut3d.H1
index 84625013..b80fd812 100644
--- a/src/graph/include/lightbut3d.H1
+++ b/src/graph/include/lightbut3d.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern int initLightButtons();
-#else
 extern int initLightButtons(buttonStruct * );
-#endif
+
diff --git a/src/graph/include/lighting3d.H1 b/src/graph/include/lighting3d.H1
index 38ebf301..9b1f9721 100644
--- a/src/graph/include/lighting3d.H1
+++ b/src/graph/include/lighting3d.H1
@@ -1,11 +1,5 @@
-#ifdef _NO_PROTO
-extern int makeLightingPanel();
-extern void drawLightingAxes();
-extern void drawLightTransArrow();
-extern void drawLightingPanel();
-#else
 extern int makeLightingPanel(void);
 extern void drawLightingAxes(void);
 extern void drawLightTransArrow(void);
 extern void drawLightingPanel(void);
-#endif
+
diff --git a/src/graph/include/main2d.H1 b/src/graph/include/main2d.H1
index 7283dad6..cbb4d43f 100644
--- a/src/graph/include/main2d.H1
+++ b/src/graph/include/main2d.H1
@@ -1,7 +1,3 @@
-#ifdef _NO_PROTO
-extern int main();
-extern void mergeDatabases();
-#else
 extern int main(void);
 extern void mergeDatabases(void);
-#endif
+
diff --git a/src/graph/include/main3d.H1 b/src/graph/include/main3d.H1
index 7283dad6..cbb4d43f 100644
--- a/src/graph/include/main3d.H1
+++ b/src/graph/include/main3d.H1
@@ -1,7 +1,3 @@
-#ifdef _NO_PROTO
-extern int main();
-extern void mergeDatabases();
-#else
 extern int main(void);
 extern void mergeDatabases(void);
-#endif
+
diff --git a/src/graph/include/make2D.H1 b/src/graph/include/make2D.H1
index 26dcac5d..5cbf294a 100644
--- a/src/graph/include/make2D.H1
+++ b/src/graph/include/make2D.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern void makeView2DFromSpadData();
-#else
 extern void makeView2DFromSpadData(view2DStruct * viewdata , graphStateStruct graphState[]);
-#endif
+
diff --git a/src/graph/include/make3D.H1 b/src/graph/include/make3D.H1
index 22ee1d4f..f9f34985 100644
--- a/src/graph/include/make3D.H1
+++ b/src/graph/include/make3D.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern void makeView3DFromSpadData();
-#else
 extern void makeView3DFromSpadData(view3DStruct * viewdata , int typeOfViewport);
-#endif
+
diff --git a/src/graph/include/makeGraph.H1 b/src/graph/include/makeGraph.H1
index 419d2408..e035ba08 100644
--- a/src/graph/include/makeGraph.H1
+++ b/src/graph/include/makeGraph.H1
@@ -1,7 +1,3 @@
-#ifdef _NO_PROTO
-extern graphStruct * makeGraphFromSpadData();
-extern void discardGraph();
-#else
 extern graphStruct * makeGraphFromSpadData(void);
 extern void discardGraph(graphStruct * theGraph);
-#endif
+
diff --git a/src/graph/include/mesh3d.H1 b/src/graph/include/mesh3d.H1
index 6f70458c..ba335720 100644
--- a/src/graph/include/mesh3d.H1
+++ b/src/graph/include/mesh3d.H1
@@ -1,9 +1,4 @@
-#ifdef _NO_PROTO
-extern void getMeshNormal();
-extern void normalizeVector();
-extern float dotProduct();
-#else
 extern void getMeshNormal(float  , float  , float  , float  , float  , float  , float  , float  , float  , float  , float  , float [3]);
 extern void normalizeVector(float * );
 extern float dotProduct(float *  , float *  , int );
-#endif
+
diff --git a/src/graph/include/msort3d.H1 b/src/graph/include/msort3d.H1
index a0acb789..ec1e9ec8 100644
--- a/src/graph/include/msort3d.H1
+++ b/src/graph/include/msort3d.H1
@@ -1,7 +1,3 @@
-#ifdef _NO_PROTO
-extern poly * merge();
-extern poly * msort();
-#else
 extern poly * merge(poly *  , poly *  , int (*)(poly *  , poly * ));
 extern poly * msort(poly *  , int  , int  , int (*)(poly *  , poly * ));
-#endif
+
diff --git a/src/graph/include/pot2d.H1 b/src/graph/include/pot2d.H1
index 597c6ae7..c48ccf3a 100644
--- a/src/graph/include/pot2d.H1
+++ b/src/graph/include/pot2d.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern mouseCoord getPotValue();
-#else
 extern mouseCoord getPotValue(short  , short  , short  , short );
-#endif
+
diff --git a/src/graph/include/pot3d.H1 b/src/graph/include/pot3d.H1
index cfcd8c03..40cbe424 100644
--- a/src/graph/include/pot3d.H1
+++ b/src/graph/include/pot3d.H1
@@ -1,7 +1,3 @@
-#ifdef _NO_PROTO
-extern mouseCoord getPotValue();
-extern mouseCoord getLinearPotValue();
-#else
 extern mouseCoord getPotValue(short  , short  , short  , short );
 extern mouseCoord getLinearPotValue(short  , short  , short  , short );
-#endif
+
diff --git a/src/graph/include/process2d.H1 b/src/graph/include/process2d.H1
index dae65e2b..7beef18f 100644
--- a/src/graph/include/process2d.H1
+++ b/src/graph/include/process2d.H1
@@ -1,14 +1,3 @@
-#ifdef _NO_PROTO
-extern void doPick();
-extern void doDrop();
-extern void clickedOnGraph();
-extern void buttonAction();
-extern void processEvents();
-extern void clickedOnGraphSelect();
-#ifdef _PROCESS2D_C
-static void drawControlPushButton();
-#endif
-#else
 extern void doPick(int  , int );
 extern void doDrop(int  , int );
 extern void clickedOnGraph(int  , int );
@@ -18,4 +7,4 @@ extern void clickedOnGraphSelect(int  , int );
 #ifdef _PROCESS2D_C
 static void drawControlPushButton(int  , int );
 #endif
-#endif
+
diff --git a/src/graph/include/process3d.H1 b/src/graph/include/process3d.H1
index 8bfefafe..46a36bde 100644
--- a/src/graph/include/process3d.H1
+++ b/src/graph/include/process3d.H1
@@ -1,7 +1,3 @@
-#ifdef _NO_PROTO
-extern void buttonAction();
-extern void processEvents();
-#else
 extern void buttonAction(int );
 extern void processEvents(void);
-#endif
+
diff --git a/src/graph/include/project3d.H1 b/src/graph/include/project3d.H1
index 99287bef..3be2e5a1 100644
--- a/src/graph/include/project3d.H1
+++ b/src/graph/include/project3d.H1
@@ -1,15 +1,7 @@
-#ifdef _NO_PROTO
-extern void project();
-extern void projectAPoint();
-extern void projectAllPoints();
-extern void projectAllPolys();
-extern void projectAPoly();
-extern void projectStuff();
-#else
 extern void project(viewTriple *  , XPoint *  , int );
 extern void projectAPoint(viewTriple * );
 extern void projectAllPoints(void);
 extern void projectAllPolys(poly * );
 extern void projectAPoly(poly * );
 extern void projectStuff(float  , float  , float  , int *  , int *  , float * );
-#endif
+
diff --git a/src/graph/include/quit3d.H1 b/src/graph/include/quit3d.H1
index cb5b1fda..a445713f 100644
--- a/src/graph/include/quit3d.H1
+++ b/src/graph/include/quit3d.H1
@@ -1,7 +1,3 @@
-#ifdef _NO_PROTO
-extern int makeQuitPanel();
-extern void drawQuitPanel();
-#else
 extern int makeQuitPanel(void);
 extern void drawQuitPanel(void);
-#endif
+
diff --git a/src/graph/include/quitbut3d.H1 b/src/graph/include/quitbut3d.H1
index d33590f5..d4e5f0d1 100644
--- a/src/graph/include/quitbut3d.H1
+++ b/src/graph/include/quitbut3d.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern int initQuitButtons();
-#else
 extern int initQuitButtons(buttonStruct * );
-#endif
+
diff --git a/src/graph/include/readView.H1 b/src/graph/include/readView.H1
index 72c10092..dd5bc324 100644
--- a/src/graph/include/readView.H1
+++ b/src/graph/include/readView.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern int readViewport();
-#else
 extern int readViewport(viewManager * viewPort , void * info , int size);
-#endif
+
diff --git a/src/graph/include/save3d.H1 b/src/graph/include/save3d.H1
index 7f4e2241..fc89846b 100644
--- a/src/graph/include/save3d.H1
+++ b/src/graph/include/save3d.H1
@@ -1,7 +1,3 @@
-#ifdef _NO_PROTO
-extern int makeSavePanel();
-extern void drawSavePanel();
-#else
 extern int makeSavePanel(void);
 extern void drawSavePanel(void);
-#endif
+
diff --git a/src/graph/include/savebut3d.H1 b/src/graph/include/savebut3d.H1
index 74f253f9..2a88b7b2 100644
--- a/src/graph/include/savebut3d.H1
+++ b/src/graph/include/savebut3d.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern int initSaveButtons();
-#else
 extern int initSaveButtons(buttonStruct * );
-#endif
+
diff --git a/src/graph/include/smoothShade3d.H1 b/src/graph/include/smoothShade3d.H1
index 258638cd..d057bb3b 100644
--- a/src/graph/include/smoothShade3d.H1
+++ b/src/graph/include/smoothShade3d.H1
@@ -1,22 +1,3 @@
-#ifdef _NO_PROTO
-extern char get_cBuffer_axes();
-extern void put_cBuffer_axes();
-extern int get_cBuffer_indx();
-extern void put_cBuffer_indx();
-extern void put_zBuffer();
-extern float get_zBuffer();
-extern void put_imageX();
-extern void drawPhongSpan();
-extern void scanPhong();
-extern void boxTObuffer();
-extern void clipboxTObuffer();
-extern void axesTObuffer();
-extern void scanLines();
-extern void freePolyList();
-extern void showAxesLabels();
-extern void changeColorMap();
-extern void drawPhong();
-#else
 extern char get_cBuffer_axes(int );
 extern void put_cBuffer_axes(int  , char );
 extern int get_cBuffer_indx(int );
@@ -34,4 +15,4 @@ extern void freePolyList(void );
 extern void showAxesLabels(int );
 extern void changeColorMap(void );
 extern void drawPhong(int );
-#endif
+
diff --git a/src/graph/include/spadAction2d.H1 b/src/graph/include/spadAction2d.H1
index edf84047..78371cfd 100644
--- a/src/graph/include/spadAction2d.H1
+++ b/src/graph/include/spadAction2d.H1
@@ -1,7 +1,3 @@
-#ifdef _NO_PROTO
-extern int readViewman();
-extern int spadAction();
-#else
 extern int readViewman(void *  , int );
 extern int spadAction(void);
-#endif
+
diff --git a/src/graph/include/spadAction3d.H1 b/src/graph/include/spadAction3d.H1
index bff7f438..3c6cca00 100644
--- a/src/graph/include/spadAction3d.H1
+++ b/src/graph/include/spadAction3d.H1
@@ -1,9 +1,4 @@
-#ifdef _NO_PROTO
-extern int readViewman();
-extern void scalePoint();
-extern int spadAction();
-#else
 extern int readViewman(void *  , int );
 extern void scalePoint(viewTriple * );
 extern int spadAction(void);
-#endif
+
diff --git a/src/graph/include/spoon2D.H1 b/src/graph/include/spoon2D.H1
index c6899a63..d908ade9 100644
--- a/src/graph/include/spoon2D.H1
+++ b/src/graph/include/spoon2D.H1
@@ -1,9 +1,3 @@
-#ifdef _NO_PROTO
-extern void spoonView2D();
-extern void makeView2DFromFileData();
-extern void sendGraphToView2D();
-#else
 extern void spoonView2D(void);
 extern void makeView2DFromFileData(view2DStruct * );
 extern void sendGraphToView2D(int  , int  , viewManager * );
-#endif
diff --git a/src/graph/include/spoonComp.H1 b/src/graph/include/spoonComp.H1
index 23f10f1b..80b1fdfd 100644
--- a/src/graph/include/spoonComp.H1
+++ b/src/graph/include/spoonComp.H1
@@ -1,7 +1,3 @@
-#ifdef _NO_PROTO
-extern void spoonView3D();
-extern void makeView3DFromFileData();
-#else
 extern void spoonView3D(int );
 extern void makeView3DFromFileData(int );
-#endif
+
diff --git a/src/graph/include/sselect.H1 b/src/graph/include/sselect.H1
index 1982c98f..9dc75670 100644
--- a/src/graph/include/sselect.H1
+++ b/src/graph/include/sselect.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern int superSelect();
-#else
 extern int superSelect(int n , int * rd , int * wr , int * ex , char * timeout);
-#endif
+
diff --git a/src/graph/include/stuff2d.H1 b/src/graph/include/stuff2d.H1
index e8488e88..36d66039 100644
--- a/src/graph/include/stuff2d.H1
+++ b/src/graph/include/stuff2d.H1
@@ -1,7 +1,3 @@
-#ifdef _NO_PROTO
-extern float absolute();
-extern void goodbye();
-#else
 extern float absolute(float);
 extern void goodbye(int);
-#endif
+
diff --git a/src/graph/include/stuff3d.H1 b/src/graph/include/stuff3d.H1
index ffd16370..2a57a7fe 100644
--- a/src/graph/include/stuff3d.H1
+++ b/src/graph/include/stuff3d.H1
@@ -1,13 +1,6 @@
-#ifdef _NO_PROTO
-extern viewTriple * traverse();
-extern float absolute();
-extern float get_random();
-extern triple norm_dist();
-extern void goodbye();
-#else
 extern viewTriple * traverse(int );
 extern float absolute(float );
 extern float get_random(void );
 extern triple norm_dist(void );
 extern void goodbye(int);
-#endif
+
diff --git a/src/graph/include/surface3d.H1 b/src/graph/include/surface3d.H1
index 20823a8e..111d3b54 100644
--- a/src/graph/include/surface3d.H1
+++ b/src/graph/include/surface3d.H1
@@ -1,20 +1,3 @@
-#ifdef _NO_PROTO
-extern void drawLineComponent();
-extern void drawOpaquePolygon();
-extern poly * copyPolygons();
-extern void minMaxPolygons();
-extern int polyCompare();
-extern void calcEyePoint();
-extern void drawRenderedPolygon();
-extern void freePointResevoir();
-extern void freeListOfPolygons();
-extern void drawPolygons();
-extern int lessThan();
-extern int greaterThan();
-extern int isNaN();
-extern int isNaNPoint();
-extern int equal();
-#else
 extern void drawLineComponent(poly *  , int );
 extern void drawOpaquePolygon(poly *  , GC  , GC  , int );
 extern poly * copyPolygons(poly * );
@@ -30,4 +13,4 @@ extern int greaterThan(float  , float );
 extern int isNaN(float );
 extern int isNaNPoint(float  , float  , float );
 extern int equal(float  , float );
-#endif
+
diff --git a/src/graph/include/transform3d.H1 b/src/graph/include/transform3d.H1
index dc8c5895..0bab41c9 100644
--- a/src/graph/include/transform3d.H1
+++ b/src/graph/include/transform3d.H1
@@ -1,15 +1,7 @@
-#ifdef _NO_PROTO
-extern void matrixMultiply4x4();
-extern void vectorMatrix4();
-extern void ROTATE();
-extern void ROTATE1();
-extern void SCALE();
-extern void TRANSLATE();
-#else
 extern void matrixMultiply4x4(float [4][4] , float [4][4] , float [4][4]);
 extern void vectorMatrix4(float [4] , float [4][4] , float [4]);
 extern void ROTATE(float [4][4]);
 extern void ROTATE1(float [4][4]);
 extern void SCALE(float  , float  , float  , float [4][4]);
 extern void TRANSLATE(float  , float  , float  , float [4][4]);
-#endif
+
diff --git a/src/graph/include/viewAlone.H1 b/src/graph/include/viewAlone.H1
index def07621..05c81aa2 100644
--- a/src/graph/include/viewAlone.H1
+++ b/src/graph/include/viewAlone.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern int main();
-#else
 extern int main(int  , char * []);
-#endif
+
diff --git a/src/graph/include/viewport2D.H1 b/src/graph/include/viewport2D.H1
index 634abb96..55163d03 100644
--- a/src/graph/include/viewport2D.H1
+++ b/src/graph/include/viewport2D.H1
@@ -1,11 +1,5 @@
-#ifdef _NO_PROTO
-extern void writeTitle();
-extern void drawTheViewport();
-extern viewPoints * makeViewport();
-extern viewPoints * makeView2D();
-#else
 extern void writeTitle(void);
 extern void drawTheViewport(int );
 extern viewPoints * makeViewport(char *  , int  , int  , int  , int  , int );
 extern viewPoints * makeView2D(view2DStruct * );
-#endif
+
diff --git a/src/graph/include/viewport3d.H1 b/src/graph/include/viewport3d.H1
index 7cf42c2f..82e1143a 100644
--- a/src/graph/include/viewport3d.H1
+++ b/src/graph/include/viewport3d.H1
@@ -1,15 +1,7 @@
-#ifdef _NO_PROTO
-extern void writeTitle();
-extern void drawPreViewport();
-extern void drawTheViewport();
-extern int keepDrawingViewport();
-extern viewPoints * makeViewport();
-extern void postMakeViewport();
-#else
 extern void writeTitle(void);
 extern void drawPreViewport(int );
 extern void drawTheViewport(int );
 extern int keepDrawingViewport(void);
 extern viewPoints * makeViewport(void);
 extern void postMakeViewport(void);
-#endif
+
diff --git a/src/graph/include/volume3d.H1 b/src/graph/include/volume3d.H1
index e9245f31..80504f3f 100644
--- a/src/graph/include/volume3d.H1
+++ b/src/graph/include/volume3d.H1
@@ -1,15 +1,3 @@
-#ifdef _NO_PROTO
-extern int initVolumeButtons();
-extern void makeVolumePanel();
-extern void drawClipXBut();
-extern void drawClipYBut();
-extern void drawClipZBut();
-extern void drawClipVolume();
-extern void drawHitherControl();
-extern void drawEyeControl();
-extern void drawFrustrum();
-extern void drawVolumePanel();
-#else
 extern int initVolumeButtons(buttonStruct * );
 extern void makeVolumePanel(void );
 extern void drawClipXBut(void );
@@ -20,4 +8,4 @@ extern void drawHitherControl(void );
 extern void drawEyeControl(void );
 extern void drawFrustrum(void );
 extern void drawVolumePanel(void );
-#endif
+
diff --git a/src/graph/include/write2d.H1 b/src/graph/include/write2d.H1
index 2925821e..d8eaddcf 100644
--- a/src/graph/include/write2d.H1
+++ b/src/graph/include/write2d.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern int writeViewport();
-#else
 extern int writeViewport(int );
-#endif
+
diff --git a/src/graph/include/write3d.H1 b/src/graph/include/write3d.H1
index 2925821e..d8eaddcf 100644
--- a/src/graph/include/write3d.H1
+++ b/src/graph/include/write3d.H1
@@ -1,5 +1,2 @@
-#ifdef _NO_PROTO
-extern int writeViewport();
-#else
 extern int writeViewport(int );
-#endif
+
diff --git a/src/graph/view2D/buttons2d.c b/src/graph/view2D/buttons2d.c
index 3d7a4be6..226aeb26 100644
--- a/src/graph/view2D/buttons2d.c
+++ b/src/graph/view2D/buttons2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -58,12 +58,7 @@
  *****************************************************/
 
 int 
-#ifdef _NO_PROTO
-initButtons (buttons)
-buttonStruct *buttons;
-#else
 initButtons (buttonStruct *buttons)
-#endif
 {
   int ii, num = 0;
 
diff --git a/src/graph/view2D/control2d.c b/src/graph/view2D/control2d.c
index 5645e2ec..18409a49 100644
--- a/src/graph/view2D/control2d.c
+++ b/src/graph/view2D/control2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -80,11 +80,7 @@ static XPoint translateArrow[translateArrowN] = {
  ****************************/
 
 void 
-#ifdef _NO_PROTO
-writeControlTitle()
-#else
 writeControlTitle(void)
-#endif
 {
 
   int strlength;
@@ -100,12 +96,7 @@ writeControlTitle(void)
 } /* writeControlTitle() */
 
 void 
-#ifdef _NO_PROTO
-makeMessageFromData(whichGraph)
-int whichGraph;
-#else
 makeMessageFromData(int whichGraph)
-#endif
 {
   if (viewport->haveControl) {
     if ((graphStateArray[whichGraph].scaleX) > 99.0) {
@@ -144,11 +135,7 @@ makeMessageFromData(int whichGraph)
 
 
 void 
-#ifdef _NO_PROTO
-writeControlMessage()
-#else
 writeControlMessage(void)
-#endif
 {
   int                strlength;
   controlPanelStruct *cp;
@@ -171,11 +158,7 @@ writeControlMessage(void)
 /*********************************/
 
 void 
-#ifdef _NO_PROTO
-drawControlPanel()
-#else
 drawControlPanel(void)
-#endif
 {
 
   controlPanelStruct *cp;
@@ -381,12 +364,7 @@ drawControlPanel(void)
 }    /*** drawControlPanel ***/
 
 controlXY 
-#ifdef _NO_PROTO
-getControlXY(whereDoYouWantPanel)
-int whereDoYouWantPanel;
-#else
 getControlXY(int whereDoYouWantPanel)
-#endif
 {
   XWindowAttributes wAttr, wAttrib;
   controlXY         cXY;
@@ -450,11 +428,7 @@ getControlXY(int whereDoYouWantPanel)
 /************************************************/
 
 controlPanelStruct *
-#ifdef _NO_PROTO
-makeControlPanel()
-#else
 makeControlPanel(void)
-#endif
 {
 
   Window cw;
@@ -569,12 +543,7 @@ makeControlPanel(void)
    right hand corner of the viewport window. */
 
 void 
-#ifdef _NO_PROTO
-putControlPanelSomewhere(whereDoesPanelGo)
-int whereDoesPanelGo;
-#else
 putControlPanelSomewhere(int whereDoesPanelGo)
-#endif
 {
   controlPanelStruct *control;
   controlXY          whereControl;
@@ -605,11 +574,7 @@ putControlPanelSomewhere(int whereDoesPanelGo)
 /************************************/
 
 void 
-#ifdef _NO_PROTO
-clearControlMessage()
-#else
 clearControlMessage(void)
-#endif
 {
 
   strcpy(viewport->controlPanel->message,"");
diff --git a/src/graph/view2D/graph2d.c b/src/graph/view2D/graph2d.c
index 47960cd7..04d855e9 100644
--- a/src/graph/view2D/graph2d.c
+++ b/src/graph/view2D/graph2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All right reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -47,12 +47,7 @@
 
 
 void 
-#ifdef _NO_PROTO
-getGraphFromViewman(i)
-int i;
-#else
 getGraphFromViewman(int i)
-#endif
 {
  /** This routine should be called right after a read of the graph key 
      was made from the viewport manager (or defined in some other way). **/
@@ -145,12 +140,7 @@ getGraphFromViewman(int i)
 
 
 void 
-#ifdef _NO_PROTO
-freeGraph(i)
-int i;
-#else
 freeGraph(int i)
-#endif
 {
   int j;
   pointListStruct *llPtr;
diff --git a/src/graph/view2D/main2d.c b/src/graph/view2D/main2d.c
index c7ade472..90405883 100644
--- a/src/graph/view2D/main2d.c
+++ b/src/graph/view2D/main2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -149,11 +149,7 @@ char    *PSfilename,    /* output file name used in user directory */
   *envAXIOM;    /* used as ps file pathnames */
 
 int
-#ifdef _NO_PROTO
-main() 
-#else
 main(void) 
-#endif
 {
 
   XGCValues       controlGCVals;
@@ -456,11 +452,7 @@ main(void)
 } /* main() */
 
 void 
-#ifdef _NO_PROTO
-mergeDatabases()
-#else
 mergeDatabases(void)
-#endif
 {
   /* using global
      rDB
diff --git a/src/graph/view2D/pot2d.c b/src/graph/view2D/pot2d.c
index 95443a4d..63b06ab3 100644
--- a/src/graph/view2D/pot2d.c
+++ b/src/graph/view2D/pot2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -41,12 +41,7 @@
 #include "all_2d.H1"
 
 mouseCoord 
-#ifdef _NO_PROTO
-getPotValue(eX,eY,xH,yH)
-  short eX,eY,xH,yH;
-#else
 getPotValue(short eX,short eY,short xH,short yH)
-#endif
 {
 
   mouseCoord whereMouse;
diff --git a/src/graph/view2D/spadAction2d.c b/src/graph/view2D/spadAction2d.c
index 900d4358..e837b47c 100644
--- a/src/graph/view2D/spadAction2d.c
+++ b/src/graph/view2D/spadAction2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -51,13 +51,7 @@
  ******************************/
 
 int 
-#ifdef _NO_PROTO
-readViewman(info,size)
-  void *info;
-  int size;
-#else
 readViewman(void * info,int size)
-#endif
 {
   int mold = 0;
 
@@ -73,11 +67,7 @@ readViewman(void * info,int size)
  ********************/
 extern int viewAloned;
 int 
-#ifdef _NO_PROTO
-spadAction()
-#else
 spadAction(void)
-#endif
 {
   int code,viewCommand;
   float f1,f2;
diff --git a/src/graph/view2D/stuff2d.c b/src/graph/view2D/stuff2d.c
index 1d5d75a5..9b0c396b 100644
--- a/src/graph/view2D/stuff2d.c
+++ b/src/graph/view2D/stuff2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -51,12 +51,7 @@
 /**************************/
 
 float 
-#ifdef _NO_PROTO
-absolute(x)
-  float x;
-#else
 absolute(float x)
-#endif
 {
   if (x<0.0) {
     return(-x);
@@ -72,12 +67,7 @@ absolute(float x)
 /************************/
 
 void 
-#ifdef _NO_PROTO
-goodbye(sig)
-int sig;
-#else
 goodbye(int sig)
-#endif
 {
   int Command,i;
 
diff --git a/src/graph/view2D/viewport2D.c b/src/graph/view2D/viewport2D.c
index a0a06aa9..a5934018 100644
--- a/src/graph/view2D/viewport2D.c
+++ b/src/graph/view2D/viewport2D.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -69,11 +69,7 @@ Atom    wm_delete_window;
  ***************************/
 
 void 
-#ifdef _NO_PROTO
-writeTitle()
-#else
 writeTitle(void)
-#endif
 {
 
   int strlength;
@@ -96,12 +92,7 @@ writeTitle(void)
 /********************************/
 
 void 
-#ifdef _NO_PROTO
-drawTheViewport(dFlag)
-int dFlag;              /* display flag: X, PS,... */
-#else
 drawTheViewport(int dFlag)
-#endif
 {
 
   Window            vw;
@@ -565,13 +556,7 @@ drawTheViewport(int dFlag)
  ************************************/
 
 viewPoints *
-#ifdef _NO_PROTO
-makeViewport(title,vX,vY,vW,vH,showCP)
-  char *title;
-  int vX,vY,vW,vH,showCP;
-#else
 makeViewport(char *title,int vX,int vY,int vW,int vH,int showCP)
-#endif
 {
   Pixmap               spadbits,spadmask;
   XSetWindowAttributes viewAttrib;
@@ -684,12 +669,7 @@ makeViewport(char *title,int vX,int vY,int vW,int vH,int showCP)
 
 
 viewPoints *
-#ifdef _NO_PROTO
-makeView2D(viewdata)
-  view2DStruct *viewdata;
-#else
 makeView2D(view2DStruct *viewdata)
-#endif
 {
   viewPoints *vPoints;  
 
diff --git a/src/graph/view2D/write2d.c b/src/graph/view2D/write2d.c
index 7a00fc68..4eaffbe2 100644
--- a/src/graph/view2D/write2d.c
+++ b/src/graph/view2D/write2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -50,12 +50,7 @@
 #define numBits (8*sizeof(int))
 
 int 
-#ifdef _NO_PROTO
-writeViewport(thingsToWrite)
-  int thingsToWrite;
-#else
 writeViewport(int thingsToWrite)
-#endif
 {
 
   FILE              *viewDataFile;
diff --git a/src/graph/view3D/buttons3d.c b/src/graph/view3D/buttons3d.c
index 898a6799..56d52584 100644
--- a/src/graph/view3D/buttons3d.c
+++ b/src/graph/view3D/buttons3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -54,12 +54,7 @@
  *****************************************************/
 
 int
-#ifdef _NO_PROTO
-initButtons (buttons)
-     buttonStruct *buttons;
-#else
 initButtons (buttonStruct *buttons)
-#endif
 {
   
   int PBY = 297; /* panel button Y coordinate at which buttons appear */
diff --git a/src/graph/view3D/closeView3d.c b/src/graph/view3D/closeView3d.c
index bb3e8257..c4b55185 100644
--- a/src/graph/view3D/closeView3d.c
+++ b/src/graph/view3D/closeView3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -56,11 +56,7 @@
  *****************************************************/
 
 void
-#ifdef _NO_PROTO
-closeViewport ()
-#else
 closeViewport (void)
-#endif
 {
   int i;
 
diff --git a/src/graph/view3D/component3d.c b/src/graph/view3D/component3d.c
index fab1b5c3..a4d0622c 100644
--- a/src/graph/view3D/component3d.c
+++ b/src/graph/view3D/component3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -55,11 +55,7 @@
 
 
 void 
-#ifdef _NO_PROTO
-scaleComponents ()
-#else
 scaleComponents (void)
-#endif
 {
   
   double xRange,yRange,zRange;
@@ -149,12 +145,7 @@ scaleComponents (void)
  */
 
 void
-#ifdef _NO_PROTO
-makeTriangle (a, b, c)
-     int a,b,c;
-#else
 makeTriangle (int a, int b, int c)
-#endif
 {
   poly *aPoly;
   
@@ -195,11 +186,7 @@ makeTriangle (int a, int b, int c)
   */
 
 void
-#ifdef _NO_PROTO
-triangulate ()
-#else
 triangulate (void)
-#endif
 {
   
   int u,l;
@@ -292,11 +279,7 @@ triangulate (void)
 
 
 void
-#ifdef _NO_PROTO
-readComponentsFromViewman ()
-#else
 readComponentsFromViewman (void)
-#endif
 {
   int i,j,k;
   LLPoint *anLLPoint;
@@ -369,11 +352,7 @@ readComponentsFromViewman (void)
   */
 
 void
-#ifdef _NO_PROTO
-calcNormData ()
-#else
 calcNormData (void)
-#endif
 {
   
   poly *aPoly;
@@ -436,11 +415,7 @@ calcNormData (void)
   */
 
 viewPoints *
-#ifdef _NO_PROTO
-make3DComponents ()
-#else
 make3DComponents (void)
-#endif
 {
   viewPoints *graphData;
 
@@ -494,12 +469,7 @@ make3DComponents (void)
 
 
 void
-#ifdef _NO_PROTO
-draw3DComponents (dFlag)
-     int dFlag;
-#else
 draw3DComponents (int dFlag)
-#endif
 {
   
   int        i, j, k, hue, x1, y1, x2, y2;
diff --git a/src/graph/view3D/control3d.c b/src/graph/view3D/control3d.c
index 3544484c..a2a693cb 100644
--- a/src/graph/view3D/control3d.c
+++ b/src/graph/view3D/control3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -78,11 +78,7 @@ static int rotateX, rotateY, rotateR;
   */
 
 void
-#ifdef _NO_PROTO
-drawColorMap ()
-#else
 drawColorMap (void)
-#endif
 {
   
   controlPanelStruct *cp;
@@ -162,12 +158,7 @@ drawColorMap (void)
  *******************************/
 
 void
-#ifdef _NO_PROTO
-writeControlTitle (w)
-        Window w;
-#else
 writeControlTitle (Window w)
-#endif
 {
   int strlength;
 
@@ -187,11 +178,7 @@ writeControlTitle (Window w)
 /************************************/
 
 void
-#ifdef _NO_PROTO
-clearControlMessage ()
-#else
 clearControlMessage (void)
-#endif
 {
   int strlength;
 
@@ -210,11 +197,7 @@ clearControlMessage (void)
 /************************************/
 
 void
-#ifdef _NO_PROTO
-writeControlMessage ()
-#else
 writeControlMessage (void)
-#endif
 {
 
   int strlength;
@@ -240,11 +223,7 @@ writeControlMessage (void)
 /*********************************/
 
 void
-#ifdef _NO_PROTO
-drawControlPanel()
-#else
 drawControlPanel(void )
-#endif
 {
 
   int                   offShade=14;
@@ -816,12 +795,7 @@ drawControlPanel(void )
  *****************************/
 
 controlXY
-#ifdef _NO_PROTO
-getControlXY (whereDoYouWantPanel)
-  int whereDoYouWantPanel;
-#else
 getControlXY (int whereDoYouWantPanel)
-#endif
 {
 
   XWindowAttributes wAttrib;
@@ -896,11 +870,7 @@ getControlXY (int whereDoYouWantPanel)
 /************************************************/
 
 controlPanelStruct *
-#ifdef _NO_PROTO
-makeControlPanel ()
-#else
 makeControlPanel (void)
-#endif
 {
 
   Window                cw;
@@ -1022,12 +992,7 @@ makeControlPanel (void)
  *****************************************/
 
 void
-#ifdef _NO_PROTO
-putControlPanelSomewhere (whereDoesPanelGo)
-  int whereDoesPanelGo;
-#else
 putControlPanelSomewhere (int whereDoesPanelGo)
-#endif
 {
   controlPanelStruct *control;
   controlXY          whereControl;
diff --git a/src/graph/view3D/illuminate3d.c b/src/graph/view3D/illuminate3d.c
index fbfa5559..bb47a9ee 100644
--- a/src/graph/view3D/illuminate3d.c
+++ b/src/graph/view3D/illuminate3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -57,13 +57,7 @@
  ***********************/
 
 float 
-#ifdef _NO_PROTO
-phong(pt,N)
-  triple      pt;
-  float       N[3];
-#else
 phong(triple pt,float N[3])
-#endif
 {
   float     dotLN, dotHN, H[3], E[3], P[3], NM[3], L[3];
   float     color, diffuse, specular;
@@ -116,12 +110,7 @@ phong(triple pt,float N[3])
 }
 
 int 
-#ifdef _NO_PROTO
-hueValue(val)
-  float val;
-#else
 hueValue(float val)
-#endif
 {
   int hue;
         
@@ -132,12 +121,7 @@ hueValue(float val)
 }
 
 int 
-#ifdef _NO_PROTO
-getHue(val)
-  float val;
-#else
 getHue(float val)
-#endif
 {
   int hue;
         
@@ -156,12 +140,7 @@ getHue(float val)
 /**** Conversion functions for different color models ****/
 
 float 
-#ifdef _NO_PROTO
-Value(n1, n2, hue)
-  float n1, n2, hue;
-#else
 Value(float n1, float n2, float hue)
-#endif
 {
   float v;
 
@@ -185,12 +164,7 @@ Value(float n1, float n2, float hue)
 
 
 RGB
-#ifdef _NO_PROTO
-hlsTOrgb(h,l,s)
-  float  h, l, s;
-#else
 hlsTOrgb(float h,float l,float s)
-#endif
 {
   RGB rgb;
   float m1, m2;
diff --git a/src/graph/view3D/lightbut3d.c b/src/graph/view3D/lightbut3d.c
index 6ed0ff3b..3ff3a931 100644
--- a/src/graph/view3D/lightbut3d.c
+++ b/src/graph/view3D/lightbut3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -50,12 +50,7 @@
  *****************************************************/
 
 int 
-#ifdef _NO_PROTO
-initLightButtons (lightButtons)
-        buttonStruct *lightButtons;
-#else
 initLightButtons (buttonStruct *lightButtons)
-#endif
 {
   int ii;
   int num = 0;
diff --git a/src/graph/view3D/lighting3d.c b/src/graph/view3D/lighting3d.c
index 8d8bb50d..b3432c5f 100644
--- a/src/graph/view3D/lighting3d.c
+++ b/src/graph/view3D/lighting3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -85,11 +85,7 @@ static viewTriple point0 = {0,0,0};
  ***************************/
 
 int
-#ifdef _NO_PROTO
-makeLightingPanel()
-#else
 makeLightingPanel(void)
-#endif
 {
 
   int i;
@@ -194,11 +190,7 @@ makeLightingPanel(void)
  ***************************/
 
 void 
-#ifdef _NO_PROTO
-drawLightingAxes()
-#else
 drawLightingAxes(void)
-#endif
 {
 
   XWindowAttributes laInfo;
@@ -298,11 +290,7 @@ drawLightingAxes(void)
  ******************************/
 
 void 
-#ifdef _NO_PROTO
-drawLightTransArrow()
-#else
 drawLightTransArrow(void)
-#endif
 {
 
   int i;
@@ -386,11 +374,7 @@ drawLightTransArrow(void)
  ****************************/
 
 void
-#ifdef _NO_PROTO
-drawLightingPanel()
-#else
 drawLightingPanel(void)
-#endif
 {
 
   char *s;
diff --git a/src/graph/view3D/main3d.c b/src/graph/view3D/main3d.c
index 7929199b..a3d2e3a0 100644
--- a/src/graph/view3D/main3d.c
+++ b/src/graph/view3D/main3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -238,13 +238,7 @@ int    smoothConst = 50;
 
 
 int 
-#ifdef _NO_PROTO
-the_handler(display,event) 
-     Display *display;
-     XErrorEvent *event;
-#else
 the_handler(Display *display,XErrorEvent *event) 
-#endif
 {
   char buffer[512];
   XGetErrorText(display,event->error_code,buffer,511);
@@ -253,11 +247,7 @@ the_handler(Display *display,XErrorEvent *event)
 }
 
 int
-#ifdef _NO_PROTO
-main() 
-#else
 main(void) 
-#endif
 {
 
   XGCValues     controlGCVals;
@@ -604,11 +594,7 @@ main(void)
 
 
 void
-#ifdef _NO_PROTO
-mergeDatabases()
-#else
 mergeDatabases(void)
-#endif
 {
   XrmDatabase homeDB,serverDB,applicationDB;
   char filenamebuf[1024];
diff --git a/src/graph/view3D/mesh3d.c b/src/graph/view3D/mesh3d.c
index ee71074b..41af7277 100644
--- a/src/graph/view3D/mesh3d.c
+++ b/src/graph/view3D/mesh3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -46,13 +46,8 @@
  ***************************************************************************/
 
 void 
-#ifdef _NO_PROTO
-getMeshNormal(x0,y0,z0,x1,y1,z1,x2,y2,z2,zMin,zRange,Normal)
-  float x0,y0,z0,x1,y1,z1,x2,y2,z2,zMin,zRange,Normal[3]; 
-#else
 getMeshNormal(float x0,float y0,float z0,float x1,float y1,float z1,
               float x2,float y2,float z2,float zMin,float zRange,float Normal[3])
-#endif
 {
   float Ax,Ay,Az,Bx,By,Bz,
         UnitFactor;
@@ -89,12 +84,7 @@ getMeshNormal(float x0,float y0,float z0,float x1,float y1,float z1,
  ***********************************/
 
 void 
-#ifdef _NO_PROTO
-normalizeVector(v)
-  float *v;
-#else
 normalizeVector(float *v)
-#endif
 {
    /* v should be a triple (ignoring the rest of the array if necessary) */
 
@@ -117,13 +107,7 @@ normalizeVector(float *v)
  ************************************/
 
 float 
-#ifdef _NO_PROTO
-dotProduct(a,b,size)
-  float *a,*b;
-  int size;
-#else
 dotProduct(float * a,float *b,int size)
-#endif
 {
   int i;
   float f=0;
diff --git a/src/graph/view3D/msort3d.c b/src/graph/view3D/msort3d.c
index 36e07743..792196a8 100644
--- a/src/graph/view3D/msort3d.c
+++ b/src/graph/view3D/msort3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -95,13 +95,7 @@
  **********************/
 
 linkThing *
-#ifdef _NO_PROTO
-merge(p,q,compare)
-     linkThing *p,*q;
-     int (*compare)();
-#else
 merge(linkThing *p, linkThing *q,int (*compare)(linkThing *, linkThing *))
-#endif
 {
   linkThing *returnVal,*current,*pN,*qN;
 
@@ -147,14 +141,7 @@ merge(linkThing *p, linkThing *q,int (*compare)(linkThing *, linkThing *))
  *********************************/
 
 linkThing *
-#ifdef _NO_PROTO
-msort(p,min,max,compare)
-  linkThing *p;
-  int min,max;
-  int (*compare)();
-#else
 msort(linkThing *p,int min,int max,int (*compare)(linkThing *, linkThing *))
-#endif
 {
   int mid;
   int i;
diff --git a/src/graph/view3D/pot3d.c b/src/graph/view3D/pot3d.c
index 6b4a9fd5..cdd52799 100644
--- a/src/graph/view3D/pot3d.c
+++ b/src/graph/view3D/pot3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -44,12 +44,7 @@
 /****************************/
 
 mouseCoord 
-#ifdef _NO_PROTO
-getPotValue(eX,eY,xH,yH)
-     short eX,eY,xH,yH;
-#else
 getPotValue(short eX,short eY,short xH,short yH)
-#endif
 {
 
   mouseCoord whereMouse;
@@ -77,12 +72,7 @@ getPotValue(short eX,short eY,short xH,short yH)
 /**********************************/
 
 mouseCoord 
-#ifdef _NO_PROTO
-getLinearPotValue(eX,eY,xH,yH)
-     short eX,eY,xH,yH;
-#else
 getLinearPotValue(short eX,short eY,short xH,short yH)
-#endif
 {
 
   mouseCoord whereMouse;
diff --git a/src/graph/view3D/process3d.c b/src/graph/view3D/process3d.c
index 9f267279..df52259d 100644
--- a/src/graph/view3D/process3d.c
+++ b/src/graph/view3D/process3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
diff --git a/src/graph/view3D/project3d.c b/src/graph/view3D/project3d.c
index 4108ec0e..185eda45 100644
--- a/src/graph/view3D/project3d.c
+++ b/src/graph/view3D/project3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -51,14 +51,7 @@
  *******************************************/
 
 void 
-#ifdef _NO_PROTO
-project(aViewTriple,someXpoints,i)
-viewTriple *aViewTriple;
-XPoint     *someXpoints;
-int        i;
-#else
 project(viewTriple * aViewTriple,XPoint *someXpoints,int i)
-#endif
 {
   float Vtmp[4], V[4], V1[4];
 
@@ -107,12 +100,7 @@ project(viewTriple * aViewTriple,XPoint *someXpoints,int i)
  ***************************************************/
 
 void 
-#ifdef _NO_PROTO
-projectAPoint(aViewTriple)
-        viewTriple *aViewTriple;
-#else
 projectAPoint(viewTriple *aViewTriple)
-#endif
 {
   float Vtmp[4], V[4], V1[4];
  
@@ -158,11 +146,7 @@ projectAPoint(viewTriple *aViewTriple)
  ***************************/
 
 void 
-#ifdef _NO_PROTO
-projectAllPoints()
-#else
 projectAllPoints(void)
-#endif
 {
 
   int i,j,k;
@@ -199,12 +183,7 @@ projectAllPoints(void)
  *******************************/
 
 void 
-#ifdef _NO_PROTO
-projectAllPolys (pList)
-        poly *pList;
-#else
 projectAllPolys (poly *pList)
-#endif
 {
 
   int i,clipped,clippedPz;
@@ -279,12 +258,7 @@ projectAllPolys (poly *pList)
 
 
 void 
-#ifdef _NO_PROTO
-projectAPoly (p)
-        poly *p;
-#else
 projectAPoly (poly *p)
-#endif
 {
 
   int i,clipped,clippedPz;
@@ -372,14 +346,7 @@ projectAPoly (poly *p)
  **********************************/
 
 void 
-#ifdef _NO_PROTO
-projectStuff(x,y,z,px,py,Pz)
-     float x,y,z;
-     int *px,*py;
-     float *Pz;
-#else
 projectStuff(float x,float y,float z,int *px,int *py,float *Pz)
-#endif
 {
   float tempx,tempy,tempz,temps,V[4],V1[4],stuffScale=100.0;
 
diff --git a/src/graph/view3D/quit3d.c b/src/graph/view3D/quit3d.c
index 3b633852..27d0b6b0 100644
--- a/src/graph/view3D/quit3d.c
+++ b/src/graph/view3D/quit3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -61,11 +61,7 @@
  ***************************/
 
 int
-#ifdef _NO_PROTO
-makeQuitPanel()
-#else
 makeQuitPanel(void)
-#endif
 {
 
   int i;
@@ -133,11 +129,7 @@ makeQuitPanel(void)
  ****************************/
 
 void
-#ifdef _NO_PROTO
-drawQuitPanel()
-#else
 drawQuitPanel(void)
-#endif
 {
 
   char *s;
diff --git a/src/graph/view3D/quitbut3d.c b/src/graph/view3D/quitbut3d.c
index ec85d09e..ca458386 100644
--- a/src/graph/view3D/quitbut3d.c
+++ b/src/graph/view3D/quitbut3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -44,12 +44,7 @@
 
 
 int 
-#ifdef _NO_PROTO
-initQuitButtons (quitButtons)
-buttonStruct *quitButtons;
-#else
 initQuitButtons (buttonStruct *quitButtons)
-#endif
 {
   int ii;
   int num = 0;
diff --git a/src/graph/view3D/save3d.c b/src/graph/view3D/save3d.c
index 45eae76f..23e85d54 100644
--- a/src/graph/view3D/save3d.c
+++ b/src/graph/view3D/save3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -61,11 +61,7 @@
  ***************************/
 
 int
-#ifdef _NO_PROTO
-makeSavePanel()
-#else
 makeSavePanel(void)
-#endif
 {
 
   int i;
@@ -134,11 +130,7 @@ makeSavePanel(void)
  ****************************/
 
 void
-#ifdef _NO_PROTO
-drawSavePanel()
-#else
 drawSavePanel(void)
-#endif
 {
 
   char *s;
diff --git a/src/graph/view3D/savebut3d.c b/src/graph/view3D/savebut3d.c
index 2a2f8811..241c2fab 100644
--- a/src/graph/view3D/savebut3d.c
+++ b/src/graph/view3D/savebut3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -41,12 +41,7 @@
 
 #include "all_3d.H1"
 int 
-#ifdef _NO_PROTO
-initSaveButtons (saveButtons)
-        buttonStruct *saveButtons;
-#else
 initSaveButtons (buttonStruct *saveButtons)
-#endif
 {
   int ii;
   int num = 0;
diff --git a/src/graph/view3D/smoothShade3d.c b/src/graph/view3D/smoothShade3d.c
index 4d74c5a0..a8ae6bb7 100644
--- a/src/graph/view3D/smoothShade3d.c
+++ b/src/graph/view3D/smoothShade3d.c
@@ -59,84 +59,45 @@
 
 
 char 
-#ifdef _NO_PROTO
-get_cBuffer_axes(ix)
-     int ix;
-#else
 get_cBuffer_axes(int ix)
-#endif
 {
         if( ix >=0 && ix <ARRAY_WIDTH) return (cBuffer[ix].axes);
         return ('0');
 }
 
 void 
-#ifdef _NO_PROTO
-put_cBuffer_axes(ix,val)
-     int ix;
-     char val;
-#else
 put_cBuffer_axes(int ix,char val)
-#endif
 {
         if( ix >=0 && ix <ARRAY_WIDTH) cBuffer[ix].axes = val;
 }
 
 int 
-#ifdef _NO_PROTO
-get_cBuffer_indx(ix)
-     int ix;
-#else
 get_cBuffer_indx(int ix)
-#endif
 {
         if( ix >=0 && ix <ARRAY_WIDTH) return (cBuffer[ix].indx);
         return (-1);
 }
 
 void 
-#ifdef _NO_PROTO
-put_cBuffer_indx(ix,val)
-     int ix;
-     int val;
-#else
 put_cBuffer_indx(int ix,int val)
-#endif
 {
         if( ix >=0 && ix <ARRAY_WIDTH) cBuffer[ix].indx = val;
 }
 
 void 
-#ifdef _NO_PROTO
-put_zBuffer(ix,val)
-     int ix;
-     float val;
-#else
 put_zBuffer(int ix,float val)
-#endif
 {
         if (ix >=0 && ix <ARRAY_WIDTH) zBuffer[ix] = val;
 }
 
 float 
-#ifdef _NO_PROTO
-get_zBuffer(ix)
-     int ix;
-#else
 get_zBuffer(int ix)
-#endif
 {
         return (zBuffer[ix]);
 }
 
 void 
-#ifdef _NO_PROTO
-put_imageX(ix,val)
-     int ix;
-     char val;
-#else
 put_imageX(int ix,char val)
-#endif
 {
   if (ix <=0 && ix <vwInfo.width) imageX->data[ix] = val;
 }
@@ -154,14 +115,7 @@ put_imageX(int ix,char val)
  * scanline.               *
  ***************************/
 void 
-#ifdef _NO_PROTO
-drawPhongSpan(pt,N,dFlag)
-   triple pt;
-   float   N[3];
-   int    dFlag;
-#else
 drawPhongSpan(triple pt,float N[3],int dFlag)
-#endif
 {
   int                xpixel,hue,shade;
   float              colorindx, col;
@@ -251,12 +205,7 @@ drawPhongSpan(triple pt,float N[3],int dFlag)
  ***************************/
 
 void 
-#ifdef _NO_PROTO
-scanPhong(dFlag)
-     int  dFlag;
-#else
 scanPhong(int dFlag)
-#endif
 {
   viewTriple *p1, *p2;
   polyList   *polygon;
@@ -377,11 +326,7 @@ scanPhong(int dFlag)
  ********************************************/
 
 void 
-#ifdef _NO_PROTO
-boxTObuffer()
-#else
 boxTObuffer(void)
-#endif
 {
   int    xpix,i,j,k,count,decision;
   int    xA,xB,yA,yB;
@@ -457,11 +402,7 @@ boxTObuffer(void)
  ********************************************/
 
 void 
-#ifdef _NO_PROTO
-clipboxTObuffer()
-#else
 clipboxTObuffer(void)
-#endif
 {
   int    xpix,i,j,k,count,decision;
   int    xA,xB,yA,yB;
@@ -537,11 +478,7 @@ clipboxTObuffer(void)
  ********************************************/
 
 void 
-#ifdef _NO_PROTO
-axesTObuffer()
-#else
 axesTObuffer(void)
-#endif
 {
   int    xpix,i,count,decision;
   int    xA,xB,yA,yB;
@@ -610,12 +547,7 @@ axesTObuffer(void)
  ********************************************/
 
 void 
-#ifdef _NO_PROTO
-scanLines(dFlag)
-  int dFlag;
-#else
 scanLines(int dFlag)
-#endif
 {
   unsigned long pixColor;
   int           i;
@@ -786,11 +718,7 @@ scanLines(int dFlag)
  *************************************/
 
 void
-#ifdef _NO_PROTO
-freePolyList ()
-#else
 freePolyList (void)
-#endif
 {
   polyList *P, *nextP;
   int  i;
@@ -813,12 +741,7 @@ freePolyList (void)
  ********************************************/
 
 void 
-#ifdef _NO_PROTO
-showAxesLabels(dFlag)
-     int  dFlag;
-#else
 showAxesLabels(int dFlag)
-#endif
 {
   int  xcoord2,ycoord2;
 
@@ -880,11 +803,7 @@ showAxesLabels(int dFlag)
  ********************************************/
 
 void 
-#ifdef _NO_PROTO
-changeColorMap()
-#else
 changeColorMap(void)
-#endif
 {
   int         okay, i, hue, *index;
   poly        *cp;
@@ -963,12 +882,7 @@ changeColorMap(void)
  ***********************/
 
 void
-#ifdef _NO_PROTO
-drawPhong(dFlag)
-     int dFlag;
-#else
 drawPhong(int dFlag)
-#endif
 {
 
     poly          *p, *head;
diff --git a/src/graph/view3D/spadAction3d.c b/src/graph/view3D/spadAction3d.c
index 15ffa76f..4c5dcfc8 100644
--- a/src/graph/view3D/spadAction3d.c
+++ b/src/graph/view3D/spadAction3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -48,13 +48,7 @@
 #include "all_3d.H1"
 
 int 
-#ifdef _NO_PROTO
-readViewman (info,size)
-  void *info;
-  int size;
-#else
 readViewman (void *info,int size)
-#endif
 {
   int m = 0;
 
@@ -65,12 +59,7 @@ readViewman (void *info,int size)
 
 }
 void 
-#ifdef _NO_PROTO
-scalePoint (p)
-        viewTriple *p;
-#else
 scalePoint (viewTriple *p)
-#endif
 {
 
   p->x *= viewData.scaleToView;
@@ -90,11 +79,7 @@ scalePoint (viewTriple *p)
  ********************/
 
 int 
-#ifdef _NO_PROTO
-spadAction ()
-#else
 spadAction (void)
-#endif
 {
   int code, viewCommand;
   float f1, f2, f3;
diff --git a/src/graph/view3D/stuff3d.c b/src/graph/view3D/stuff3d.c
index 5b828ed5..9c3041da 100644
--- a/src/graph/view3D/stuff3d.c
+++ b/src/graph/view3D/stuff3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -56,12 +56,7 @@
  *****************************/
 
 viewTriple *
-#ifdef _NO_PROTO
-traverse (n)
-        int n;
-#else
 traverse (int n)
-#endif
 {
 
   int i;
@@ -79,12 +74,7 @@ traverse (int n)
 /**************************/
 
 float
-#ifdef _NO_PROTO
-absolute (x)
-        float x;
-#else
 absolute (float x)
-#endif
 {
 
   if (x<0.0) return(-x);
@@ -100,11 +90,7 @@ absolute (float x)
 /****************************/
 
 float
-#ifdef _NO_PROTO
-get_random()
-#else
 get_random(void)
-#endif
 {
 
   float x;
@@ -122,11 +108,7 @@ get_random(void)
 /****************************/
 
 triple
-#ifdef _NO_PROTO
-norm_dist()
-#else
 norm_dist(void)
-#endif
 {
 
   float   u1, u2, v1, v2, ss, rad;
@@ -154,12 +136,7 @@ norm_dist(void)
 /************************/
 
 void
-#ifdef _NO_PROTO
-goodbye(sig)
-int sig;
-#else
 goodbye(int sig)
-#endif
 {
 
   int Command;
diff --git a/src/graph/view3D/surface3d.c b/src/graph/view3D/surface3d.c
index 652c3a1a..b89bb6d6 100644
--- a/src/graph/view3D/surface3d.c
+++ b/src/graph/view3D/surface3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -71,13 +71,7 @@ pointInfo ptIA, ptIB, ptIC; /* global to this file */
  ************************************/
 
 void
-#ifdef _NO_PROTO
-drawLineComponent (p, dFlag)
-     poly *p;
-     int  dFlag;
-#else
 drawLineComponent (poly * p, int dFlag)
-#endif 
 {
   int i, hue;
   int *anIndex;
@@ -127,14 +121,7 @@ drawLineComponent (poly * p, int dFlag)
  **************************************************/
 
 void
-#ifdef _NO_PROTO
-drawOpaquePolygon (p,aGC,anotherGC,dFlag)
-     poly *p;
-     GC aGC,anotherGC;
-     int dFlag;
-#else
 drawOpaquePolygon (poly *p,GC aGC,GC anotherGC,int dFlag)
-#endif 
 {
 
   int *anIndex, i, hue, isNaN = 0;
@@ -211,12 +198,7 @@ drawOpaquePolygon (poly *p,GC aGC,GC anotherGC,int dFlag)
  *************************************/
 
 poly *
-#ifdef _NO_PROTO
-copyPolygons (polygonList)
-     poly *polygonList;
-#else
 copyPolygons (poly *polygonList)
-#endif 
 {
 
   int i;
@@ -300,12 +282,7 @@ copyPolygons (poly *polygonList)
  ******************************/
 
 void
-#ifdef _NO_PROTO
-minMaxPolygons (aPoly)
-     poly *aPoly;
-#else
 minMaxPolygons (poly *aPoly)
-#endif 
 {
 
   int *anIndex;
@@ -364,12 +341,7 @@ minMaxPolygons (poly *aPoly)
  ***********************************/
 
 int
-#ifdef _NO_PROTO
-polyCompare (p1,p2)
-     poly *p1,*p2;
-#else
 polyCompare (poly *p1,poly *p2)
-#endif 
 {
 
   if (p1->pzmax > p2->pzmax) return(-1);
@@ -387,11 +359,7 @@ polyCompare (poly *p1,poly *p2)
  ***********************/
 
 void
-#ifdef _NO_PROTO
-calcEyePoint ()
-#else
 calcEyePoint (void)
-#endif 
 {
 
   eyePoint[0] = sinPhi * (sinTheta);
@@ -419,13 +387,7 @@ calcEyePoint (void)
  **************************************/
 
 void
-#ifdef _NO_PROTO
-drawRenderedPolygon (p,dFlag)
-     poly *p;
-     int dFlag;
-#else
 drawRenderedPolygon (poly *p,int dFlag)
-#endif 
 {
 
   int        i,hue,shade, isNaN = 0;
@@ -573,11 +535,7 @@ drawRenderedPolygon (poly *p,int dFlag)
 
 
 void 
-#ifdef _NO_PROTO
-freePointResevoir()
-#else
 freePointResevoir(void)
-#endif
 {
 
   viewTriple *v;
@@ -597,12 +555,7 @@ freePointResevoir(void)
  ***********************************/
 
 void
-#ifdef _NO_PROTO
-freeListOfPolygons (pList)
-poly *pList;
-#else
 freeListOfPolygons (poly *pList)
-#endif 
 {
 
   poly *nextP;
@@ -617,12 +570,7 @@ freeListOfPolygons (poly *pList)
 
 
 void
-#ifdef _NO_PROTO
-drawPolygons(dFlag)
-     int dFlag;
-#else
 drawPolygons(int dFlag)
-#endif 
 {
 
   poly *p,*head;
@@ -781,12 +729,7 @@ drawPolygons(int dFlag)
  **************************/
 
 int
-#ifdef _NO_PROTO
-lessThan (x,y)
-     float x,y;
-#else
 lessThan (float x,float y)
-#endif 
 {
   int xI,yI;
 
@@ -796,12 +739,7 @@ lessThan (float x,float y)
 }
 
 int
-#ifdef _NO_PROTO
-greaterThan (x,y)
-     float x,y;
-#else
 greaterThan (float x,float y)
-#endif 
 {
   int xI,yI;
 
@@ -811,35 +749,20 @@ greaterThan (float x,float y)
 }
 
 int
-#ifdef _NO_PROTO
-isNaN (v)
-     float v;
-#else
 isNaN (float v)
-#endif 
 {
   return (v != v);
 }
 
 
 int
-#ifdef _NO_PROTO
-isNaNPoint (x,y,z)
-     float x,y,z;
-#else
 isNaNPoint (float x,float y,float z)
-#endif 
 {
   return (isNaN(x) || isNaN(y) || isNaN(z));
 }
 
 int
-#ifdef _NO_PROTO
-equal (x,y)
-     float x,y;
-#else
 equal (float x,float y)
-#endif 
 {
   int xI,yI;
 
diff --git a/src/graph/view3D/testcol.c b/src/graph/view3D/testcol.c
index a48cb9c8..9c3a58d9 100644
--- a/src/graph/view3D/testcol.c
+++ b/src/graph/view3D/testcol.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -246,11 +246,7 @@ int    smoothConst = 50;
 
 
 void
-#ifdef _NO_PROTO
-main() 
-#else
 main(void) 
-#endif
 {
 
   XGCValues     controlGCVals;
diff --git a/src/graph/view3D/transform3d.c b/src/graph/view3D/transform3d.c
index 83d47210..52483c6a 100644
--- a/src/graph/view3D/transform3d.c
+++ b/src/graph/view3D/transform3d.c
@@ -42,12 +42,7 @@
 #include "all_3d.H1"
 
 void 
-#ifdef _NO_PROTO
-matrixMultiply4x4(xxA,xxB,array)   
-     float xxA[4][4], xxB[4][4], array[4][4];
-#else
 matrixMultiply4x4(float xxA[4][4],float xxB[4][4],float array[4][4])   
-#endif
 {
   array[0][0] = xxA[0][0]*xxB[0][0] + xxA[0][1]*xxB[1][0] + 
                 xxA[0][2]*xxB[2][0] + xxA[0][3]*xxB[3][0]; 
@@ -85,12 +80,7 @@ matrixMultiply4x4(float xxA[4][4],float xxB[4][4],float array[4][4])
 
 
 void 
-#ifdef _NO_PROTO
-vectorMatrix4(xxD,xxE,xxF)   
-     float xxD[4], xxE[4][4], xxF[4];
-#else
 vectorMatrix4(float xxD[4],float xxE[4][4],float xxF[4])   
-#endif
 {
   xxF[0]= xxD[0]*xxE[0][0] + xxD[1]*xxE[1][0] + xxD[2]*xxE[2][0] + xxD[3]*xxE[3][0]; 
   xxF[1]= xxD[0]*xxE[0][1] + xxD[1]*xxE[1][1] + xxD[2]*xxE[2][1] + xxD[3]*xxE[3][1]; 
@@ -100,12 +90,7 @@ vectorMatrix4(float xxD[4],float xxE[4][4],float xxF[4])
 
 
 void 
-#ifdef _NO_PROTO
-ROTATE(xxR)  
-     float xxR[4][4];
-#else
 ROTATE(float xxR[4][4])  
-#endif
 {
   xxR[0][0]= -(cosTheta); xxR[0][1]= -(-sinTheta*cosPhi); xxR[0][2]= -(sinTheta*sinPhi);  xxR[0][3]= 0.0; 
   xxR[1][0]= -(sinTheta); xxR[1][1]= -(cosTheta*cosPhi);  xxR[1][2]= -(-cosTheta*sinPhi); xxR[1][3]= 0.0; 
@@ -114,12 +99,7 @@ ROTATE(float xxR[4][4])
 }
 
 void 
-#ifdef _NO_PROTO
-ROTATE1(xxR)  
-     float xxR[4][4];
-#else
 ROTATE1(float xxR[4][4])  
-#endif
 {
   xxR[0][0]= (cosTheta); xxR[0][1]= (-sinTheta*cosPhi); xxR[0][2]= (sinTheta*sinPhi);  xxR[0][3]= 0.0; 
   xxR[1][0]= (sinTheta); xxR[1][1]= (cosTheta*cosPhi);  xxR[1][2]= (-cosTheta*sinPhi); xxR[1][3]= 0.0; 
@@ -129,12 +109,7 @@ ROTATE1(float xxR[4][4])
 
 
 void 
-#ifdef _NO_PROTO
-SCALE(x,y,z,xxS)  
-     float x, y, z, xxS[4][4];
-#else
 SCALE(float x,float y,float z,float xxS[4][4])  
-#endif
 {
   xxS[0][0] = x;   xxS[0][1] = 0.0; xxS[0][2] = 0.0; xxS[0][3] = 0.0; 
   xxS[1][0] = 0.0; xxS[1][1] = y;   xxS[1][2] = 0.0; xxS[1][3] = 0.0; 
@@ -144,12 +119,7 @@ SCALE(float x,float y,float z,float xxS[4][4])
 
 
 void 
-#ifdef _NO_PROTO
-TRANSLATE(x,y,z,xxT)   
-     float x, y, z, xxT[4][4];
-#else
 TRANSLATE(float x,float y,float z,float xxT[4][4])   
-#endif
 {
   xxT[0][0] = 1.0; xxT[0][1] = 0.0; xxT[0][2] = 0.0;  xxT[0][3] = 0.0; 
   xxT[1][0] = 0.0; xxT[1][1] = 1.0; xxT[1][2] = 0.0;  xxT[1][3] = 0.0; 
diff --git a/src/graph/view3D/viewport3d.c b/src/graph/view3D/viewport3d.c
index 944b055b..23f060cc 100644
--- a/src/graph/view3D/viewport3d.c
+++ b/src/graph/view3D/viewport3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -73,11 +73,7 @@ Atom wm_delete_window;
  ***************************/
 
 void
-#ifdef _NO_PROTO
-writeTitle ()
-#else
 writeTitle (void)
-#endif
 {
 
   int                   strlength;
@@ -112,12 +108,7 @@ writeTitle (void)
  ****************************/
 
 void
-#ifdef _NO_PROTO
-drawPreViewport (dFlag)
-        int dFlag;              /* display flag: PS, X, etc. */
-#else
 drawPreViewport (int dFlag)
-#endif
 {
 
   int i, j, vPx0, vPy0, vPx1, vPy1;
@@ -417,12 +408,7 @@ drawPreViewport (int dFlag)
 /********************************/
 
 void
-#ifdef _NO_PROTO
-drawTheViewport (dFlag)
-        int dFlag;              /* display flag: PS, X,... */
-#else
 drawTheViewport (int dFlag)
-#endif
 {
 
   int    i,j;
@@ -524,11 +510,7 @@ drawTheViewport (int dFlag)
  ************************************/
 
 viewPoints *
-#ifdef _NO_PROTO
-makeViewport ()
-#else
 makeViewport (void)
-#endif
 {
 
   Pixmap               spadbits,spadmask;
@@ -778,11 +760,7 @@ makeViewport (void)
  *****************************/
 
 void
-#ifdef _NO_PROTO
-postMakeViewport ()
-#else
 postMakeViewport (void)
-#endif
 {
 
   corners[0].x = viewData.xmin; corners[0].y = viewData.ymin;
@@ -876,11 +854,7 @@ postMakeViewport (void)
 
 
 int
-#ifdef _NO_PROTO
-keepDrawingViewport()
-#else
 keepDrawingViewport(void)
-#endif
 {
 
   XEvent peekEvent;
diff --git a/src/graph/view3D/volume3d.c b/src/graph/view3D/volume3d.c
index aab93491..841705c2 100644
--- a/src/graph/view3D/volume3d.c
+++ b/src/graph/view3D/volume3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -118,12 +118,7 @@ int flatClipBoxX[8], flatClipBoxY[8];
 /******************* volume buttons **********************/
 
 int
-#ifdef _NO_PROTO
-initVolumeButtons (volumeButtons)
-     buttonStruct *volumeButtons;
-#else
 initVolumeButtons (buttonStruct *volumeButtons)
-#endif
 {
   int ii, num = 0;
 
@@ -262,11 +257,7 @@ initVolumeButtons (buttonStruct *volumeButtons)
  *************************/
 
 void
-#ifdef _NO_PROTO
-makeVolumePanel ()
-#else
 makeVolumePanel (void)
-#endif
 {
 
   int i;
@@ -330,11 +321,7 @@ makeVolumePanel (void)
 
 
 void
-#ifdef _NO_PROTO
-drawClipXBut ()
-#else
 drawClipXBut (void)
-#endif
 {
 
   XClearArea(dsply,volumeWindow,clipXButX,clipXButY,
@@ -397,11 +384,7 @@ drawClipXBut (void)
 }
 
 void
-#ifdef _NO_PROTO
-drawClipYBut ()
-#else
 drawClipYBut (void)
-#endif
 {
 
   XClearArea(dsply,volumeWindow,clipYButX,clipYButY,
@@ -467,11 +450,7 @@ drawClipYBut (void)
 
 
 void
-#ifdef _NO_PROTO
-drawClipZBut ()
-#else
 drawClipZBut (void)
-#endif
 {
 
   XClearArea(dsply,volumeWindow,clipZButX,clipZButY,
@@ -509,11 +488,7 @@ drawClipZBut (void)
 
 
 void
-#ifdef _NO_PROTO
-drawClipVolume ()
-#else
 drawClipVolume (void)
-#endif
 {
 
   float xminL,xmaxL,yminL,ymaxL,zminL,zmaxL;
@@ -573,11 +548,7 @@ drawClipVolume (void)
 
 
 void
-#ifdef _NO_PROTO
-drawHitherControl ()
-#else
 drawHitherControl (void)
-#endif
 {
 
   float xx,b,slope;
@@ -632,11 +603,7 @@ drawHitherControl (void)
 }
 
 void
-#ifdef _NO_PROTO
-drawEyeControl ()
-#else
 drawEyeControl (void)
-#endif
 {
 
   float here;
@@ -687,11 +654,7 @@ drawEyeControl (void)
  **************************/
 
 void
-#ifdef _NO_PROTO
-drawFrustrum ()
-#else
 drawFrustrum (void)
-#endif
 {
 
   float normalizedEyeDistance;
@@ -730,11 +693,7 @@ drawFrustrum (void)
  **************************/
 
 void
-#ifdef _NO_PROTO
-drawVolumePanel ()
-#else
 drawVolumePanel (void)
-#endif
 {
 
   int i,strlength;
diff --git a/src/graph/view3D/write3d.c b/src/graph/view3D/write3d.c
index b836241b..ee0711fb 100644
--- a/src/graph/view3D/write3d.c
+++ b/src/graph/view3D/write3d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -55,12 +55,7 @@
 #define StellarColors 9
 
 int 
-#ifdef _NO_PROTO
-writeViewport (thingsToWrite)
-        int thingsToWrite;
-#else
 writeViewport (int thingsToWrite)
-#endif
 {
 
   int               i, j, k, ii, code, *anIndex;
diff --git a/src/graph/viewAlone/spoon2D.c b/src/graph/viewAlone/spoon2D.c
index 054ed5a3..45353ffc 100644
--- a/src/graph/viewAlone/spoon2D.c
+++ b/src/graph/viewAlone/spoon2D.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -51,11 +51,7 @@
 /* #define spoonDEBUG  */
 
 void 
-#ifdef _NO_PROTO
-spoonView2D()
-#else
 spoonView2D(void)
-#endif
 {
 
   int  i,code,pipe0[2],pipe1[2],there;
@@ -148,13 +144,7 @@ spoonView2D(void)
 
 /*void sendGraphToView2D(i,there,viewP) */
 void 
-#ifdef _NO_PROTO
-sendGraphToView2D(i,there,viewP)
-  int i,there;
-  viewManager *viewP;
-#else
 sendGraphToView2D(int i,int there,viewManager *viewP)
-#endif
 {
   graphStruct      *gPtr;
   pointListStruct  *llPtr;
@@ -216,12 +206,7 @@ sendGraphToView2D(int i,int there,viewManager *viewP)
 
 
 void  
-#ifdef _NO_PROTO
-makeView2DFromFileData(doView2D)
-  view2DStruct *doView2D;
-#else
 makeView2DFromFileData(view2DStruct *doView2D)
-#endif
 {
   
   int i,j,k;
diff --git a/src/graph/viewAlone/spoonComp.c b/src/graph/viewAlone/spoonComp.c
index 857c3d5c..c3b36f44 100644
--- a/src/graph/viewAlone/spoonComp.c
+++ b/src/graph/viewAlone/spoonComp.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -53,12 +53,7 @@
    changes there may require similar changes here. */
 
 void 
-#ifdef _NO_PROTO
-spoonView3D(type)
-     int type;
-#else
 spoonView3D(int type)
-#endif
 {
   
   int  i,j,k,code,pipe0[2],pipe1[2];
@@ -169,12 +164,7 @@ spoonView3D(int type)
 
 
 void
-#ifdef _NO_PROTO
-makeView3DFromFileData(type)
-     int type;
-#else
 makeView3DFromFileData(int type)
-#endif
 {
   
   int i,j,k;
diff --git a/src/graph/viewAlone/viewAlone.c b/src/graph/viewAlone/viewAlone.c
index 4d18ecc3..9df3b047 100644
--- a/src/graph/viewAlone/viewAlone.c
+++ b/src/graph/viewAlone/viewAlone.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   all rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -71,13 +71,7 @@ char pathname[256];
 
 /************* main program **************/
 
-#ifdef _NO_PROTO
-int main (argc,argv)
-     int argc;
-     char *argv[];
-#else
 int main (int argc,char *argv[])
-#endif 
 {
         printf("viewAlone called with argc=%d\n",argc);
         printf("viewAlone called with argv[1]=%s\n",argv[0]);
diff --git a/src/graph/viewman/cleanup.c b/src/graph/viewman/cleanup.c
index 6d42d963..761e7f92 100644
--- a/src/graph/viewman/cleanup.c
+++ b/src/graph/viewman/cleanup.c
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -52,12 +52,7 @@
 #include "readView.H1"
 
 void
-#ifdef _NO_PROTO
-brokenPipe(sig)
-int sig;
-#else
 brokenPipe(int sig)
-#endif
 {
   fprintf(stderr,
           "The viewport manager tried to write to a non-existing pipe.\n");
@@ -65,12 +60,7 @@ brokenPipe(int sig)
 
 
 void
-#ifdef _NO_PROTO
-endChild(sig)
-int sig;
-#else
 endChild(int sig)
-#endif
 {
 
   checkClosedChild = yes;
@@ -87,12 +77,7 @@ endChild(int sig)
 *****************************/
 
 void 
-#ifdef _NO_PROTO
-rmViewMgr(slotPtr)
-     viewManager *slotPtr;
-#else
 rmViewMgr(viewManager *slotPtr)
-#endif
 {
   
   int i,throwAway,code;
@@ -182,12 +167,7 @@ rmViewMgr(viewManager *slotPtr)
  ***********************************/
 
 void  
-#ifdef _NO_PROTO
-closeChildViewport(slotPtr)
-     viewManager *slotPtr;
-#else
 closeChildViewport(viewManager *slotPtr)
-#endif
 {
   
   int status;
@@ -206,12 +186,7 @@ closeChildViewport(viewManager *slotPtr)
  *********************/
 
 void 
-#ifdef _NO_PROTO
-goodbye(sig)
-int sig;
-#else
 goodbye(int sig)
-#endif
 {
 
   viewManager *v;
diff --git a/src/graph/viewman/fun2D.c b/src/graph/viewman/fun2D.c
index f2cdda03..49a84454 100644
--- a/src/graph/viewman/fun2D.c
+++ b/src/graph/viewman/fun2D.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -55,12 +55,7 @@
 #define writeEach
 
 void 
-#ifdef _NO_PROTO
-funView2D(viewCommand)
-  int viewCommand;
-#else
 funView2D(int viewCommand)
-#endif
 {
 
   int code;
@@ -176,11 +171,7 @@ funView2D(int viewCommand)
 }
 
 void 
-#ifdef _NO_PROTO
-forkView2D()
-#else
 forkView2D(void)
-#endif
 {
 
   viewManager      *viewport;
@@ -301,14 +292,7 @@ forkView2D(void)
 
 
 void
-#ifdef _NO_PROTO
-sendGraphToView2D(i,there,viewport,doGraphStateArray)
-  int i,there;
-  viewManager *viewport;
-  graphStateStruct *doGraphStateArray;
-#else
 sendGraphToView2D(int i,int there,viewManager *viewport,graphStateStruct *doGraphStateArray)
-#endif
 {
 
   graphStruct      *gPtr;
diff --git a/src/graph/viewman/fun3D.c b/src/graph/viewman/fun3D.c
index d50f06b4..15ed92e8 100644
--- a/src/graph/viewman/fun3D.c
+++ b/src/graph/viewman/fun3D.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -52,12 +52,7 @@
 #include "readView.H1"
 
 void 
-#ifdef _NO_PROTO
-funView3D(viewCommand)
-  int viewCommand;
-#else
 funView3D(int viewCommand)
-#endif
 {
 
   int code;
@@ -227,12 +222,7 @@ funView3D(int viewCommand)
 
 }
 void
-#ifdef _NO_PROTO
-forkView3D(typeOfViewport)
-  int typeOfViewport;
-#else
 forkView3D(int typeOfViewport)
-#endif
 {
 
   viewManager *viewport;
diff --git a/src/graph/viewman/make2D.c b/src/graph/viewman/make2D.c
index a4beba4e..74f89b78 100644
--- a/src/graph/viewman/make2D.c
+++ b/src/graph/viewman/make2D.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -42,13 +42,7 @@
 #include "make2D.H1"
 
 void 
-#ifdef _NO_PROTO
-makeView2DFromSpadData(viewdata,graphState)
-  view2DStruct     *viewdata;
-  graphStateStruct graphState[];
-#else
 makeView2DFromSpadData(view2DStruct *viewdata,graphStateStruct graphState[])
-#endif
 {
 
   int i;
diff --git a/src/graph/viewman/make3D.c b/src/graph/viewman/make3D.c
index 7cac382b..349ebf09 100644
--- a/src/graph/viewman/make3D.c
+++ b/src/graph/viewman/make3D.c
@@ -45,13 +45,7 @@
 #include "make3D.H1"
 
 void 
-#ifdef _NO_PROTO
-makeView3DFromSpadData(viewdata,typeOfViewport)
-  view3DStruct *viewdata;
-  int typeOfViewport;
-#else
 makeView3DFromSpadData(view3DStruct *viewdata,int typeOfViewport)
-#endif
 {
 
   int i,j,k;
diff --git a/src/graph/viewman/makeGraph.c b/src/graph/viewman/makeGraph.c
index 8f8fc540..69e0a656 100644
--- a/src/graph/viewman/makeGraph.c
+++ b/src/graph/viewman/makeGraph.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -45,11 +45,7 @@
 #include "makeGraph.H1"
 
 graphStruct *
-#ifdef _NO_PROTO
-makeGraphFromSpadData()
-#else
 makeGraphFromSpadData(void)
-#endif
 {
   
   graphStruct     *graphData;
@@ -125,12 +121,7 @@ makeGraphFromSpadData(void)
   
 
 void 
-#ifdef _NO_PROTO
-discardGraph (theGraph)
-  graphStruct *theGraph;
-#else
 discardGraph (graphStruct *theGraph)
-#endif
 {
 
   pointListStruct *pL;
diff --git a/src/graph/viewman/readView.c b/src/graph/viewman/readView.c
index ba65b435..201e26b4 100644
--- a/src/graph/viewman/readView.c
+++ b/src/graph/viewman/readView.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -45,14 +45,7 @@
 #include "cleanup.H1"
 
 int 
-#ifdef _NO_PROTO
-readViewport (viewPort,info,size)
-  viewManager *viewPort;
-  void *info;
-  int size;
-#else
 readViewport (viewManager *viewPort,void *info,int size)
-#endif
 {
 
   int canRead;