Remove remaining K&R style prototypes.

47 files changed, 46 insertions, 346 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
+