some cleanup for noieee_src, as asked by millert@: remove fictional

includes, include math.h where needed and remove redundant declarations
ok millert@

23 files changed, 37 insertions, 13 deletions

diff --git a/lib/libm/noieee_src/mathimpl.h b/lib/libm/noieee_src/mathimpl.h
index 09f9c29b703..7fd4fa8a930 100644
--- a/lib/libm/noieee_src/mathimpl.h
+++ b/lib/libm/noieee_src/mathimpl.h
@@ -31,7 +31,6 @@
  */
 
 #include <sys/cdefs.h>
-#include <math.h>
 
 #if defined(__vax__)||defined(tahoe)
 
diff --git a/lib/libm/noieee_src/n_acosh.c b/lib/libm/noieee_src/n_acosh.c
index 975bb690da4..652624c3248 100644
--- a/lib/libm/noieee_src/n_acosh.c
+++ b/lib/libm/noieee_src/n_acosh.c
@@ -69,6 +69,7 @@ static char sccsid[] = "@(#)acosh.c	8.1 (Berkeley) 6/4/93";
  * shown.
  */
 
+#include "math.h"
 #include "mathimpl.h"
 
 vc(ln2hi, 6.9314718055829871446E-1  ,7217,4031,0000,f7d0,   0, .B17217F7D00000)
diff --git a/lib/libm/noieee_src/n_asincos.c b/lib/libm/noieee_src/n_asincos.c
index 365ac4e5a90..7e99c1c66f6 100644
--- a/lib/libm/noieee_src/n_asincos.c
+++ b/lib/libm/noieee_src/n_asincos.c
@@ -84,13 +84,14 @@ static char sccsid[] = "@(#)asincos.c	8.1 (Berkeley) 6/4/93";
  *      1.99 ulps.
  */
 
+#include "math.h"
 #include "mathimpl.h"
 
 double
 asin(x)
 	double x;
 {
-	double s,t,copysign(),atan2(),sqrt(),one=1.0;
+	double s, t, one = 1.0;
 
 	if (isnan(x))
 		return (x);
@@ -159,7 +160,7 @@ double
 acos(x)
 	double x;
 {
-	double t,copysign(),atan2(),sqrt(),one=1.0;
+	double t, one = 1.0;
 
 	if (isnan(x))
 		return (x);
diff --git a/lib/libm/noieee_src/n_asinh.c b/lib/libm/noieee_src/n_asinh.c
index c11130e58c6..c5e7f867922 100644
--- a/lib/libm/noieee_src/n_asinh.c
+++ b/lib/libm/noieee_src/n_asinh.c
@@ -64,6 +64,8 @@ static char sccsid[] = "@(#)asinh.c	8.1 (Berkeley) 6/4/93";
  * from decimal to binary accurately enough to produce the hexadecimal values
  * shown.
  */
+
+#include "math.h"
 #include "mathimpl.h"
 
 vc(ln2hi, 6.9314718055829871446E-1  ,7217,4031,0000,f7d0,   0, .B17217F7D00000)
diff --git a/lib/libm/noieee_src/n_atan.c b/lib/libm/noieee_src/n_atan.c
index f18e4cafd52..0d3d8ff40e5 100644
--- a/lib/libm/noieee_src/n_atan.c
+++ b/lib/libm/noieee_src/n_atan.c
@@ -76,9 +76,11 @@ static char sccsid[] = "@(#)atan.c	8.1 (Berkeley) 6/4/93";
  *	0.85 ulps.
  */
 
+#include "math.h"
+
 double atan(x)
 double x;
 {
-	double atan2(),one=1.0;
+	double one=1.0;
 	return(atan2(x,one));
 }
diff --git a/lib/libm/noieee_src/n_atan2.c b/lib/libm/noieee_src/n_atan2.c
index 0c927f2c219..e8f453f29d3 100644
--- a/lib/libm/noieee_src/n_atan2.c
+++ b/lib/libm/noieee_src/n_atan2.c
@@ -106,6 +106,7 @@ static char sccsid[] = "@(#)atan2.c	8.1 (Berkeley) 6/4/93";
  * shown.
  */
 
+#include "math.h"
 #include "mathimpl.h"
 
 vc(athfhi, 4.6364760900080611433E-1  ,6338,3fed,da7b,2b0d,  -1, .ED63382B0DDA7B)
diff --git a/lib/libm/noieee_src/n_atanh.c b/lib/libm/noieee_src/n_atanh.c
index 2b2ba7b9b2c..f5dd6e327d5 100644
--- a/lib/libm/noieee_src/n_atanh.c
+++ b/lib/libm/noieee_src/n_atanh.c
@@ -58,6 +58,8 @@ static char sccsid[] = "@(#)atanh.c	8.1 (Berkeley) 6/4/93";
  *	observed error was 1.87 ulps (units in the last place) at
  *	x= -3.8962076028810414000e-03.
  */
+
+#include "math.h"
 #include "mathimpl.h"
 
 #if defined(__vax__)||defined(tahoe)
diff --git a/lib/libm/noieee_src/n_cabs.c b/lib/libm/noieee_src/n_cabs.c
index 5cd83739531..695306117f8 100644
--- a/lib/libm/noieee_src/n_cabs.c
+++ b/lib/libm/noieee_src/n_cabs.c
@@ -84,6 +84,8 @@ static char sccsid[] = "@(#)cabs.c	8.1 (Berkeley) 6/4/93";
  * from decimal to binary accurately enough to produce the hexadecimal values
  * shown.
  */
+
+#include "math.h"
 #include "mathimpl.h"
 
 vc(r2p1hi, 2.4142135623730950345E0   ,8279,411a,ef32,99fc,   2, .9A827999FCEF32)
diff --git a/lib/libm/noieee_src/n_cosh.c b/lib/libm/noieee_src/n_cosh.c
index f956213e3e3..cd028e3fa88 100644
--- a/lib/libm/noieee_src/n_cosh.c
+++ b/lib/libm/noieee_src/n_cosh.c
@@ -79,6 +79,7 @@ static char sccsid[] = "@(#)cosh.c	8.1 (Berkeley) 6/4/93";
  * shown.
  */
 
+#include "math.h"
 #include "mathimpl.h"
 
 vc(mln2hi, 8.8029691931113054792E1   ,0f33,43b0,2bdb,c7e2,   7, .B00F33C7E22BDB)
diff --git a/lib/libm/noieee_src/n_erf.c b/lib/libm/noieee_src/n_erf.c
index 5eb0616f141..38d301793a1 100644
--- a/lib/libm/noieee_src/n_erf.c
+++ b/lib/libm/noieee_src/n_erf.c
@@ -32,6 +32,7 @@
 static char sccsid[] = "@(#)erf.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 
+#include "math.h"
 #include "mathimpl.h"
 
 /* Modified Nov 30, 1992 P. McILROY:
@@ -263,7 +264,7 @@ rd13 =	-1.42821001129434127360582351685e+007;
 double erf(x)
 	double x;
 {
-	double R,S,P,Q,ax,s,y,z,r,fabs(),exp();
+	double R, S, P, Q, ax, s, y, z, r;
 	if(!finite(x)) {		/* erf(nan)=nan */
 	    if (isnan(x))
 		return(x);
@@ -321,7 +322,7 @@ double erf(x)
 double erfc(x) 
 	double x;
 {
-	double R,S,P,Q,s,ax,y,z,r,fabs(),__exp__D();
+	double R, S, P, Q, s, ax, y, z, r;
 	if (!finite(x)) {
 		if (isnan(x))		/* erfc(NaN) = NaN */
 			return(x);
diff --git a/lib/libm/noieee_src/n_exp.c b/lib/libm/noieee_src/n_exp.c
index d374b3e80be..7c0db047b44 100644
--- a/lib/libm/noieee_src/n_exp.c
+++ b/lib/libm/noieee_src/n_exp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: n_exp.c,v 1.6 2008/06/12 15:57:59 martynas Exp $	*/
+/*	$OpenBSD: n_exp.c,v 1.7 2008/06/12 22:20:56 martynas Exp $	*/
 /*
  * Copyright (c) 1985, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -74,6 +74,7 @@ static char sccsid[] = "@(#)exp.c	8.1 (Berkeley) 6/4/93";
  * shown.
  */
 
+#include "math.h"
 #include "mathimpl.h"
 
 vc(ln2hi,  6.9314718055829871446E-1  ,7217,4031,0000,f7d0,   0, .B17217F7D00000)
diff --git a/lib/libm/noieee_src/n_exp__E.c b/lib/libm/noieee_src/n_exp__E.c
index 909f887e7a7..b55d8e76935 100644
--- a/lib/libm/noieee_src/n_exp__E.c
+++ b/lib/libm/noieee_src/n_exp__E.c
@@ -83,6 +83,7 @@ static char sccsid[] = "@(#)exp__E.c	8.1 (Berkeley) 6/4/93";
  * shown.
  */
 
+#include "math.h"
 #include "mathimpl.h"
 
 vc(p1, 1.5150724356786683059E-2 ,3abe,3d78,066a,67e1,  -6, .F83ABE67E1066A)
diff --git a/lib/libm/noieee_src/n_expm1.c b/lib/libm/noieee_src/n_expm1.c
index 9ac9f1cda23..fc2ebe51a3e 100644
--- a/lib/libm/noieee_src/n_expm1.c
+++ b/lib/libm/noieee_src/n_expm1.c
@@ -83,6 +83,7 @@ static char sccsid[] = "@(#)expm1.c	8.1 (Berkeley) 6/4/93";
  * shown.
  */
 
+#include "math.h"
 #include "mathimpl.h"
 
 vc(ln2hi,  6.9314718055829871446E-1  ,7217,4031,0000,f7d0,   0, .B17217F7D00000)
diff --git a/lib/libm/noieee_src/n_floor.c b/lib/libm/noieee_src/n_floor.c
index c9b7f34546a..05b29359e19 100644
--- a/lib/libm/noieee_src/n_floor.c
+++ b/lib/libm/noieee_src/n_floor.c
@@ -32,6 +32,7 @@
 static char sccsid[] = "@(#)floor.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 
+#include "math.h"
 #include "mathimpl.h"
 
 vc(L, 4503599627370496.0E0 ,0000,5c00,0000,0000, 55, 1.0) /* 2**55 */
diff --git a/lib/libm/noieee_src/n_log10.c b/lib/libm/noieee_src/n_log10.c
index 3fd3239f1d7..4b6d5eb2578 100644
--- a/lib/libm/noieee_src/n_log10.c
+++ b/lib/libm/noieee_src/n_log10.c
@@ -70,6 +70,7 @@ static char sccsid[] = "@(#)log10.c	8.1 (Berkeley) 6/4/93";
  * shown.
  */
 
+#include "math.h"
 #include "mathimpl.h"
 
 vc(ln10hi, 2.3025850929940456790E0 ,5d8d,4113,a8ac,ddaa, 2, .935D8DDDAAA8AC)
diff --git a/lib/libm/noieee_src/n_log1p.c b/lib/libm/noieee_src/n_log1p.c
index c7055fc418a..1f226ad23db 100644
--- a/lib/libm/noieee_src/n_log1p.c
+++ b/lib/libm/noieee_src/n_log1p.c
@@ -92,6 +92,7 @@ static char sccsid[] = "@(#)log1p.c	8.1 (Berkeley) 6/4/93";
  */
 
 #include <errno.h>
+#include "math.h"
 #include "mathimpl.h"
 
 vc(ln2hi, 6.9314718055829871446E-1  ,7217,4031,0000,f7d0,   0, .B17217F7D00000)
diff --git a/lib/libm/noieee_src/n_log__L.c b/lib/libm/noieee_src/n_log__L.c
index 87eae12ea9e..895760a405e 100644
--- a/lib/libm/noieee_src/n_log__L.c
+++ b/lib/libm/noieee_src/n_log__L.c
@@ -66,6 +66,7 @@ static char sccsid[] = "@(#)log__L.c	8.1 (Berkeley) 6/4/93";
  * shown.
  */
 
+#include "math.h"
 #include "mathimpl.h"
 
 vc(L1, 6.6666666666666703212E-1 ,aaaa,402a,aac5,aaaa,  0, .AAAAAAAAAAAAC5)
diff --git a/lib/libm/noieee_src/n_pow.c b/lib/libm/noieee_src/n_pow.c
index 2c3ff5cc848..3812a0c03cc 100644
--- a/lib/libm/noieee_src/n_pow.c
+++ b/lib/libm/noieee_src/n_pow.c
@@ -166,8 +166,8 @@ double x,y;
 static double
 pow_P(double x, double y)
 {
-	struct Double s, t, __log__D();
-	double  __exp__D(), huge = 1e300, tiny = 1e-300;
+	struct Double s, t;
+	double  huge = 1e300, tiny = 1e-300;
 
 	if (x == zero)
 		if (y > zero)
diff --git a/lib/libm/noieee_src/n_sincos.c b/lib/libm/noieee_src/n_sincos.c
index 59754e25758..6b8796439bc 100644
--- a/lib/libm/noieee_src/n_sincos.c
+++ b/lib/libm/noieee_src/n_sincos.c
@@ -32,8 +32,9 @@
 static char sccsid[] = "@(#)sincos.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 
+#include "math.h"
 #include "mathimpl.h"
-#include "trig.h"
+
 double
 sin(x)
 double x;
diff --git a/lib/libm/noieee_src/n_sinh.c b/lib/libm/noieee_src/n_sinh.c
index b0206dce7bc..77dd4d921a3 100644
--- a/lib/libm/noieee_src/n_sinh.c
+++ b/lib/libm/noieee_src/n_sinh.c
@@ -72,6 +72,7 @@ static char sccsid[] = "@(#)sinh.c	8.1 (Berkeley) 6/4/93";
  * shown.
  */
 
+#include "math.h"
 #include "mathimpl.h"
 
 vc(mln2hi, 8.8029691931113054792E1   ,0f33,43b0,2bdb,c7e2,   7, .B00F33C7E22BDB)
diff --git a/lib/libm/noieee_src/n_support.c b/lib/libm/noieee_src/n_support.c
index 988b8219d4b..fa5d186112e 100644
--- a/lib/libm/noieee_src/n_support.c
+++ b/lib/libm/noieee_src/n_support.c
@@ -70,6 +70,7 @@ static char sccsid[] = "@(#)support.c	8.1 (Berkeley) 6/4/93";
  * REVISED BY K.C. NG on 1/22/85, 2/13/85, 3/24/85.
  */
 
+#include "math.h"
 #include "mathimpl.h"
 
 #if defined(__vax__)||defined(tahoe)      /* VAX D format */
diff --git a/lib/libm/noieee_src/n_tan.c b/lib/libm/noieee_src/n_tan.c
index d579714dd52..f39a1958397 100644
--- a/lib/libm/noieee_src/n_tan.c
+++ b/lib/libm/noieee_src/n_tan.c
@@ -32,8 +32,9 @@
 static char sccsid[] = "@(#)tan.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 
+#include "math.h"
 #include "mathimpl.h"
-#include "trig.h"
+
 double
 tan(x) 
 double x;
diff --git a/lib/libm/noieee_src/n_tanh.c b/lib/libm/noieee_src/n_tanh.c
index bd475ae9a67..bf41f6c3b90 100644
--- a/lib/libm/noieee_src/n_tanh.c
+++ b/lib/libm/noieee_src/n_tanh.c
@@ -32,6 +32,8 @@
 static char sccsid[] = "@(#)tanh.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 
+#include "math.h"
+
 /* TANH(X)
  * RETURN THE HYPERBOLIC TANGENT OF X
  * DOUBLE PRECISION (VAX D FORMAT 56 BITS, IEEE DOUBLE 53 BITS)
@@ -73,8 +75,7 @@ double tanh(x)
 double x;
 {
 	static double one=1.0, two=2.0, small = 1.0e-10, big = 1.0e10;
-	double expm1(), t, copysign(), sign;
-	int finite();
+	double t, sign;
 
 	if (isnan(x))
 		return (x);