Rename restrict() to badratio(), as it's a C++ keyword.

5 files changed, 93 insertions, 9 deletions

diff --git a/cad/ntesla/distinfo b/cad/ntesla/distinfo
index 9be68ffadd2..105da857558 100644
--- a/cad/ntesla/distinfo
+++ b/cad/ntesla/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 16:27:00 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/12/17 16:58:25 sketch Exp $
 
 SHA1 (ntesla-1.7.tar.gz) = e52fbc19b6e6203aababb649c72989ee38003cf4
 Size (ntesla-1.7.tar.gz) = 47626 bytes
-SHA1 (patch-aa) = 1e5afe8fdfce28d86cb98359936fa376747e5fbb
+SHA1 (patch-aa) = f4e3436874c264f254d82ef3b6daf1fd596a413b
 SHA1 (patch-ab) = d4668bf6b3b7bc25f87b0b5b021a79c3375d0d87
+SHA1 (patch-ac) = 2f111ccca8ad225b126f6f8c76c754473ce14b1c
+SHA1 (patch-ad) = 2bf11bfb21c65be39fefd46dc2eb545d2fd673b4
+SHA1 (patch-ae) = f015bbe483ac45fd4ba56945c776595de0392b49
diff --git a/cad/ntesla/patches/patch-aa b/cad/ntesla/patches/patch-aa
index caf628e0a09..5b089002c95 100644
--- a/cad/ntesla/patches/patch-aa
+++ b/cad/ntesla/patches/patch-aa
@@ -1,15 +1,21 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/01/17 09:31:28 frueauf Exp $
+$NetBSD: patch-aa,v 1.2 2003/12/17 16:58:25 sketch Exp $
 
---- Makefile.orig	Sun Jan 17 01:00:50 1999
-+++ Makefile	Sun Jan 17 01:01:23 1999
-@@ -23,7 +23,9 @@
+--- Makefile.orig	Fri Mar 28 12:18:02 1997
++++ Makefile	Thu Oct 23 08:06:00 2003
+@@ -22,12 +22,14 @@
+ # Ntesla needs an ANSI C compiler.  On Sun workstations, uncomment the next
  # line, or use gcc.
  #CC=acc
 -CFLAGS=-Wall
-+CFLAGS=-Wall -O2 -Dunix
++CFLAGS += -Dunix
  
  OBJ = main.o solonoid.o wiretab.o interp.o spiral.o trans.o cap.o misc.o
-+
-+all: ntesla
  
++all: ntesla
++
  ntesla: $(OBJ)
+-	cc -o ntesla $(OBJ) -lm
++	$(CC) -o ntesla $(OBJ) -lm $(LDFLAGS)
+ 
+ clean:
+ 	rm -f $(OBJ) ntesla.prm
diff --git a/cad/ntesla/patches/patch-ac b/cad/ntesla/patches/patch-ac
new file mode 100644
index 00000000000..eb0e9a1ea59
--- /dev/null
+++ b/cad/ntesla/patches/patch-ac
@@ -0,0 +1,40 @@
+$NetBSD: patch-ac,v 1.1 2003/12/17 16:58:25 sketch Exp $
+
+--- interp.c.orig	Fri Mar 28 12:17:12 1997
++++ interp.c	Thu Oct 23 08:13:11 2003
+@@ -119,7 +119,7 @@
+ 
+ 	/* Ratio is too extreme */
+ 	if(ratio > 100.0) {
+-		restrict();
++		badratio();
+ 		return -1.0;
+ 	}
+ 
+@@ -132,7 +132,7 @@
+ {
+ 	/* Ratio is too extreme */
+ 	if(ratio < 0.1 || ratio > 50.0) {
+-		restrict();
++		badratio();
+ 		return -1.0;
+ 	}
+ 
+@@ -146,7 +146,7 @@
+ {
+ 	/* Ratio is too extreme */
+ 	if(ratio < 0.1 || ratio > 10.0) {
+-		restrict();
++		badratio();
+ 		return -1.0;
+ 	}
+ 
+@@ -155,7 +155,7 @@
+ 
+ /* Display the worst-case restriction to avoid confusion */
+ void
+-restrict()
++badratio()
+ {
+ 	E "\007Length divided by Diameter must be between 0.1 and 10.0 ");
+ }
diff --git a/cad/ntesla/patches/patch-ad b/cad/ntesla/patches/patch-ad
new file mode 100644
index 00000000000..677b765c1b9
--- /dev/null
+++ b/cad/ntesla/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/12/17 16:58:25 sketch Exp $
+
+--- protos.h.orig	Thu Oct 23 08:13:57 2003
++++ protos.h	Thu Oct 23 08:14:11 2003
+@@ -243,7 +243,7 @@
+ extern double findSolFF( double );
+ extern double findMedhurstF( double );
+ extern double findQFactor( double );
+-extern void restrict( void );
++extern void badratio( void );
+ 
+ /* cap.c */
+ extern void capgen( int );
diff --git a/cad/ntesla/patches/patch-ae b/cad/ntesla/patches/patch-ae
new file mode 100644
index 00000000000..cf02dcba3ce
--- /dev/null
+++ b/cad/ntesla/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2003/12/17 16:58:25 sketch Exp $
+
+--- solonoid.c.orig	Thu Oct 23 08:14:39 2003
++++ solonoid.c	Thu Oct 23 08:14:55 2003
+@@ -150,7 +150,7 @@
+ 					E "\007Secondary diameter must be less than primary inner diameter ");
+ 				}
+ 			} else {
+-				restrict();
++				badratio();
+ 			}
+ 		  	break;
+ 
+@@ -162,7 +162,7 @@
+ 			   (tmpval / Tcparms.secondary_diam >= 0.1)) {
+ 				Tcparms.secondary_leng = tmpval;
+ 			} else {
+-				restrict();
++				badratio();
+ 			}
+ 		  	break;
+