From 8aed71fbd9c44aa3f42394484ed14c3bc0899f1f Mon Sep 17 00:00:00 2001
From: ian <ian>
Date: Mon, 21 Sep 1998 19:58:45 +0000
Subject: [PATCH] Compiles with libc6.

---
 .cvsignore   |  1 +
 Makefile     |  4 ++--
 dualx11.cc   |  1 +
 graphics.cc  |  9 ++++++---
 library.cc   |  1 +
 main.cc      |  4 ++--
 moebius.cc   | 12 ++++++------
 parameter.cc |  3 ++-
 8 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 .cvsignore

diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..cba7efc
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1 @@
+a.out
diff --git a/Makefile b/Makefile
index 80111df..c82512a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-C++FLAGS= -Wall -O2
-CPPFLAGS= -I/usr/include
+CPPFLAGS= -I/usr/include -Wall -O2 -Wmissing-prototypes -Wstrict-prototypes $(WERROR)
+WERROR=-Werror
 LDFLAGS= 
 LIBS= 
 
diff --git a/dualx11.cc b/dualx11.cc
index 4bfc39c..dbd3e4b 100644
--- a/dualx11.cc
+++ b/dualx11.cc
@@ -29,6 +29,7 @@ DualX11Output::DualX11Output() {
                               0,0, 500,500, 0,0, pixelbase);
 
   XGCValues gcvalues;
+  int i;
   for (i=0; i<2; i++) {
     gcvalues.plane_mask= planemasks[i];
     // First, the fabric
diff --git a/graphics.cc b/graphics.cc
index 5fdfb25..ae1659e 100644
--- a/graphics.cc
+++ b/graphics.cc
@@ -23,7 +23,8 @@ static int checkneededline(Onscreen a, Onscreen b) {
 void Cell::display(Output& o) {
   int nn[4];
   int totalnn= 0;
-  for (int i=0; i<4; i++) {
+  int i;
+  for (i=0; i<4; i++) {
     nn[i]= checkneededline(p[i],p[(i+1)&3]);
     totalnn+= nn[i];
   }
@@ -55,7 +56,8 @@ SortedCellList::Fragment* SortedCellList::insertfragment(int at) {
 
 void SortedCellList::insert(Cell *it) {
   double index= it->index();
-  for (int fragment= used-1;
+  int fragment;
+  for (fragment= used-1;
        fragment >= 0 && index < fragments[fragment]->entries[0].index;
        fragment--);
   if (fragment < 0) {
@@ -65,7 +67,8 @@ void SortedCellList::insert(Cell *it) {
     nf->entries[0].cell= it;
     return;
   }
-  for (int entry= 0;
+  int entry;
+  for (entry= 0;
        entry < fragments[fragment]->used &&
        index > fragments[fragment]->entries[entry].index;
        entry++);
diff --git a/library.cc b/library.cc
index 60f8446..d15c454 100644
--- a/library.cc
+++ b/library.cc
@@ -3,6 +3,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 
 #include "library.hh"
 #include "transforms.hh"
diff --git a/main.cc b/main.cc
index 7007194..bbe9621 100644
--- a/main.cc
+++ b/main.cc
@@ -21,8 +21,8 @@
 Parameter<int> tn("tn", "Number of sections around `strip'", 30, 1, 1, 500);
 Parameter<int> un("un", "Number of sections across `strip'", 15, 1, 1, 500);
 Parameter<double> theta("theta", "Angle of model rotation",
-                        /*-PI/2.*/0, PI/8., -PI*2., PI*2.);
-Parameter<double> eta("eta", "Angle of model elevation", 0., PI/8., -PI*2., PI*2.);
+                        /*-PI/2.*/0, M_PI/8., -M_PI*2., M_PI*2.);
+Parameter<double> eta("eta", "Angle of model elevation", 0., M_PI/8., -M_PI*2., M_PI*2.);
 Parameter<double> planedistance("plane", "Distance from projection plane to origin", 
                                 4., .25, 0., 100.);
 Parameter<double> eyedistance("eye", "Distance from projection eye to origin", 
diff --git a/moebius.cc b/moebius.cc
index d68f4af..148ce0c 100644
--- a/moebius.cc
+++ b/moebius.cc
@@ -9,7 +9,7 @@
 #include "moebius.hh"
 
 Point MoebiusStrip::edgepoint(double t) {
-  double theta= (t-0.5)*4.0*PI;
+  double theta= (t-0.5)*4.0*M_PI;
   double r= 1.0 - halfgap*(1.0 - sin(theta/2.0));
   return Point(r*sin(theta),
                -r*cos(theta),
@@ -47,7 +47,7 @@ void Bezier::debug() {
 // The second end is oriented towards [0,-1,0]
 
 Point MoebiusEnfoldment::edgepoint(double t) {
-  double theta= t*2.0*PI;
+  double theta= t*2.0*M_PI;
   return Point(sin(theta),cos(theta),0);
 }
 
@@ -58,13 +58,13 @@ Point MoebiusEnfoldment::middlepoint(double t, double u) {
     double sizehere= sqrt(1-t*t);
     return Point((u*2.0-1.0) * sizehere,
                  t,
-                 sizehere * thickness * sin(u*2.0*PI));
+                 sizehere * thickness * sin(u*2.0*M_PI));
   } else {
     t /= bottomportion;
-    double theta= (.5-u)*2*PI;
-    Bezier bx(sin(theta*.5), -theta/PI, 0, 0);
+    double theta= (.5-u)*2*M_PI;
+    Bezier bx(sin(theta*.5), -theta/M_PI, 0, 0);
     double ypushiness= (1-cos(theta))*2.5+1;
-//        double fudge= (PI*sin(theta*.5)*cos(theta*.5))*(.5-u)*(.5-u)*4;
+//        double fudge= (M_PI*sin(theta*.5)*cos(theta*.5))*(.5-u)*(.5-u)*4;
     double fudge= (.5-u)*(.5-u)*4*cos(theta*.5);
     Bezier by(-cos(theta*.5), 0,
               cos(theta)*ypushiness + fudge*ypushiness,
diff --git a/parameter.cc b/parameter.cc
index 0eb6df6..89566fd 100644
--- a/parameter.cc
+++ b/parameter.cc
@@ -11,7 +11,8 @@ AnyParameter::AnyParameter(const char *n, const char *d) {
 }
 
 AnyParameter* AnyParameter::find(const char *n) {
-  for (AnyParameter* search= first;
+  AnyParameter* search;
+  for (search= first;
        search && strcmp(search->name,n);
        search= search->next);
   return search;
-- 
2.30.2