From 8db218828187d58575c509b6ed3da0cad9f73519 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 27 Jan 2012 17:27:55 +0000
Subject: Remove __STDC__ conditionals from libm.

---
 sysdeps/ieee754/flt-32/e_acoshf.c     | 11 +----------
 sysdeps/ieee754/flt-32/e_asinf.c      | 11 +----------
 sysdeps/ieee754/flt-32/e_rem_pio2f.c  | 19 +------------------
 sysdeps/ieee754/flt-32/k_cosf.c       | 11 +----------
 sysdeps/ieee754/flt-32/k_rem_pio2f.c  | 19 +------------------
 sysdeps/ieee754/flt-32/k_sinf.c       | 11 +----------
 sysdeps/ieee754/flt-32/k_tanf.c       | 11 +----------
 sysdeps/ieee754/flt-32/s_atanf.c      | 25 ++-----------------------
 sysdeps/ieee754/flt-32/s_copysignf.c  |  7 +------
 sysdeps/ieee754/flt-32/s_cosf.c       | 11 +----------
 sysdeps/ieee754/flt-32/s_erff.c       | 18 ++----------------
 sysdeps/ieee754/flt-32/s_fabsf.c      |  7 +------
 sysdeps/ieee754/flt-32/s_finitef.c    |  7 +------
 sysdeps/ieee754/flt-32/s_frexpf.c     | 11 +----------
 sysdeps/ieee754/flt-32/s_ilogbf.c     |  7 +------
 sysdeps/ieee754/flt-32/s_isnanf.c     |  7 +------
 sysdeps/ieee754/flt-32/s_logbf.c      |  7 +------
 sysdeps/ieee754/flt-32/s_nextafterf.c |  7 +------
 sysdeps/ieee754/flt-32/s_sinf.c       |  7 +------
 sysdeps/ieee754/flt-32/s_tanf.c       |  7 +------
 sysdeps/ieee754/flt-32/s_tanhf.c      | 11 +----------
 21 files changed, 23 insertions(+), 209 deletions(-)

(limited to 'sysdeps/ieee754/flt-32')

diff --git a/sysdeps/ieee754/flt-32/e_acoshf.c b/sysdeps/ieee754/flt-32/e_acoshf.c
index 777e0b9e36..5999b747a2 100644
--- a/sysdeps/ieee754/flt-32/e_acoshf.c
+++ b/sysdeps/ieee754/flt-32/e_acoshf.c
@@ -20,20 +20,11 @@ static char rcsid[] = "$NetBSD: e_acoshf.c,v 1.5 1995/05/12 04:57:20 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
 static const float
-#else
-static float
-#endif
 one	= 1.0,
 ln2	= 6.9314718246e-01;  /* 0x3f317218 */
 
-#ifdef __STDC__
-	float __ieee754_acoshf(float x)
-#else
-	float __ieee754_acoshf(x)
-	float x;
-#endif
+float __ieee754_acoshf(float x)
 {
 	float t;
 	int32_t hx;
diff --git a/sysdeps/ieee754/flt-32/e_asinf.c b/sysdeps/ieee754/flt-32/e_asinf.c
index 7296ba3e13..a420cb47a7 100644
--- a/sysdeps/ieee754/flt-32/e_asinf.c
+++ b/sysdeps/ieee754/flt-32/e_asinf.c
@@ -42,11 +42,7 @@ static char rcsid[] = "$NetBSD: e_asinf.c,v 1.5 1995/05/12 04:57:25 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
 static const float
-#else
-static float
-#endif
 one =  1.0000000000e+00, /* 0x3F800000 */
 huge =  1.000e+30,
 
@@ -63,12 +59,7 @@ p2 = 4.547037598e-2f,
 p3 = 2.417951451e-2f,
 p4 = 4.216630880e-2f;
 
-#ifdef __STDC__
-	float __ieee754_asinf(float x)
-#else
-	float __ieee754_asinf(x)
-	float x;
-#endif
+float __ieee754_asinf(float x)
 {
 	float t,w,p,q,c,r,s;
 	int32_t hx,ix;
diff --git a/sysdeps/ieee754/flt-32/e_rem_pio2f.c b/sysdeps/ieee754/flt-32/e_rem_pio2f.c
index 4b8c4466bd..c2b9793df9 100644
--- a/sysdeps/ieee754/flt-32/e_rem_pio2f.c
+++ b/sysdeps/ieee754/flt-32/e_rem_pio2f.c
@@ -29,11 +29,7 @@ static char rcsid[] = "$NetBSD: e_rem_pio2f.c,v 1.5 1995/05/10 20:46:03 jtc Exp
 /*
  * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi
  */
-#ifdef __STDC__
 static const int32_t two_over_pi[] = {
-#else
-static int32_t two_over_pi[] = {
-#endif
 0xA2, 0xF9, 0x83, 0x6E, 0x4E, 0x44, 0x15, 0x29, 0xFC,
 0x27, 0x57, 0xD1, 0xF5, 0x34, 0xDD, 0xC0, 0xDB, 0x62,
 0x95, 0x99, 0x3C, 0x43, 0x90, 0x41, 0xFE, 0x51, 0x63,
@@ -60,11 +56,7 @@ static int32_t two_over_pi[] = {
 
 /* This array is like the one in e_rem_pio2.c, but the numbers are
    single precision and the last 8 bits are forced to 0.  */
-#ifdef __STDC__
 static const int32_t npio2_hw[] = {
-#else
-static int32_t npio2_hw[] = {
-#endif
 0x3fc90f00, 0x40490f00, 0x4096cb00, 0x40c90f00, 0x40fb5300, 0x4116cb00,
 0x412fed00, 0x41490f00, 0x41623100, 0x417b5300, 0x418a3a00, 0x4196cb00,
 0x41a35c00, 0x41afed00, 0x41bc7e00, 0x41c90f00, 0x41d5a000, 0x41e23100,
@@ -83,11 +75,7 @@ static int32_t npio2_hw[] = {
  * pio2_3t:  pi/2 - (pio2_1+pio2_2+pio2_3)
  */
 
-#ifdef __STDC__
 static const float
-#else
-static float
-#endif
 zero =  0.0000000000e+00, /* 0x00000000 */
 half =  5.0000000000e-01, /* 0x3f000000 */
 two8 =  2.5600000000e+02, /* 0x43800000 */
@@ -99,12 +87,7 @@ pio2_2t =  6.0770999344e-11, /* 0x2e85a308 */
 pio2_3  =  6.0770943833e-11, /* 0x2e85a300 */
 pio2_3t =  6.1232342629e-17; /* 0x248d3132 */
 
-#ifdef __STDC__
-	int32_t __ieee754_rem_pio2f(float x, float *y)
-#else
-	int32_t __ieee754_rem_pio2f(x,y)
-	float x,y[];
-#endif
+int32_t __ieee754_rem_pio2f(float x, float *y)
 {
 	float z,w,t,r,fn;
 	float tx[3];
diff --git a/sysdeps/ieee754/flt-32/k_cosf.c b/sysdeps/ieee754/flt-32/k_cosf.c
index b232cab11f..81259470e0 100644
--- a/sysdeps/ieee754/flt-32/k_cosf.c
+++ b/sysdeps/ieee754/flt-32/k_cosf.c
@@ -20,11 +20,7 @@ static char rcsid[] = "$NetBSD: k_cosf.c,v 1.4 1995/05/10 20:46:23 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
 static const float 
-#else
-static float 
-#endif
 one =  1.0000000000e+00, /* 0x3f800000 */
 C1  =  4.1666667908e-02, /* 0x3d2aaaab */
 C2  = -1.3888889225e-03, /* 0xbab60b61 */
@@ -33,12 +29,7 @@ C4  = -2.7557314297e-07, /* 0xb493f27c */
 C5  =  2.0875723372e-09, /* 0x310f74f6 */
 C6  = -1.1359647598e-11; /* 0xad47d74e */
 
-#ifdef __STDC__
-	float __kernel_cosf(float x, float y)
-#else
-	float __kernel_cosf(x, y)
-	float x,y;
-#endif
+float __kernel_cosf(float x, float y)
 {
 	float a,hz,z,r,qx;
 	int32_t ix;
diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
index 2783480fcb..395cc789f1 100644
--- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
+++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
@@ -23,17 +23,9 @@ static char rcsid[] = "$NetBSD: k_rem_pio2f.c,v 1.4 1995/05/10 20:46:28 jtc Exp
 /* In the float version, the input parameter x contains 8 bit
    integers, not 24 bit integers.  113 bit precision is not supported.  */
 
-#ifdef __STDC__
 static const int init_jk[] = {4,7,9}; /* initial value for jk */
-#else
-static int init_jk[] = {4,7,9}; 
-#endif
 
-#ifdef __STDC__
 static const float PIo2[] = {
-#else
-static float PIo2[] = {
-#endif
   1.5703125000e+00, /* 0x3fc90000 */
   4.5776367188e-04, /* 0x39f00000 */
   2.5987625122e-05, /* 0x37da0000 */
@@ -47,22 +39,13 @@ static float PIo2[] = {
   6.3331015649e-25, /* 0x17440000 */
 };
 
-#ifdef __STDC__
 static const float			
-#else
-static float			
-#endif
 zero   = 0.0,
 one    = 1.0,
 two8   =  2.5600000000e+02, /* 0x43800000 */
 twon8  =  3.9062500000e-03; /* 0x3b800000 */
 
-#ifdef __STDC__
-	int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32_t *ipio2) 
-#else
-	int __kernel_rem_pio2f(x,y,e0,nx,prec,ipio2) 	
-	float x[], y[]; int e0,nx,prec; int32_t ipio2[];
-#endif
+int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32_t *ipio2)
 {
 	int32_t jz,jx,jv,jp,jk,carry,n,iq[20],i,j,k,m,q0,ih;
 	float z,fw,f[20],fq[20],q[20];
diff --git a/sysdeps/ieee754/flt-32/k_sinf.c b/sysdeps/ieee754/flt-32/k_sinf.c
index 4fec15e830..572363d755 100644
--- a/sysdeps/ieee754/flt-32/k_sinf.c
+++ b/sysdeps/ieee754/flt-32/k_sinf.c
@@ -20,11 +20,7 @@ static char rcsid[] = "$NetBSD: k_sinf.c,v 1.4 1995/05/10 20:46:33 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
 static const float 
-#else
-static float 
-#endif
 half =  5.0000000000e-01,/* 0x3f000000 */
 S1  = -1.6666667163e-01, /* 0xbe2aaaab */
 S2  =  8.3333337680e-03, /* 0x3c088889 */
@@ -33,12 +29,7 @@ S4  =  2.7557314297e-06, /* 0x3638ef1b */
 S5  = -2.5050759689e-08, /* 0xb2d72f34 */
 S6  =  1.5896910177e-10; /* 0x2f2ec9d3 */
 
-#ifdef __STDC__
-	float __kernel_sinf(float x, float y, int iy)
-#else
-	float __kernel_sinf(x, y, iy)
-	float x,y; int iy;		/* iy=0 if y is zero */
-#endif
+float __kernel_sinf(float x, float y, int iy)
 {
 	float z,r,v;
 	int32_t ix;
diff --git a/sysdeps/ieee754/flt-32/k_tanf.c b/sysdeps/ieee754/flt-32/k_tanf.c
index eb1a670939..8b34811e4f 100644
--- a/sysdeps/ieee754/flt-32/k_tanf.c
+++ b/sysdeps/ieee754/flt-32/k_tanf.c
@@ -19,11 +19,7 @@ static char rcsid[] = "$NetBSD: k_tanf.c,v 1.4 1995/05/10 20:46:39 jtc Exp $";
 
 #include "math.h"
 #include "math_private.h"
-#ifdef __STDC__
 static const float 
-#else
-static float 
-#endif
 one   =  1.0000000000e+00, /* 0x3f800000 */
 pio4  =  7.8539812565e-01, /* 0x3f490fda */
 pio4lo=  3.7748947079e-08, /* 0x33222168 */
@@ -43,12 +39,7 @@ T[] =  {
   2.5907305826e-05, /* 0x37d95384 */
 };
 
-#ifdef __STDC__
-	float __kernel_tanf(float x, float y, int iy)
-#else
-	float __kernel_tanf(x, y, iy)
-	float x,y; int iy;
-#endif
+float __kernel_tanf(float x, float y, int iy)
 {
 	float z,r,v,w,s;
 	int32_t ix,hx;
diff --git a/sysdeps/ieee754/flt-32/s_atanf.c b/sysdeps/ieee754/flt-32/s_atanf.c
index a68933fa6a..8a3aa811b2 100644
--- a/sysdeps/ieee754/flt-32/s_atanf.c
+++ b/sysdeps/ieee754/flt-32/s_atanf.c
@@ -20,33 +20,21 @@ static char rcsid[] = "$NetBSD: s_atanf.c,v 1.4 1995/05/10 20:46:47 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
 static const float atanhi[] = {
-#else
-static float atanhi[] = {
-#endif
   4.6364760399e-01, /* atan(0.5)hi 0x3eed6338 */
   7.8539812565e-01, /* atan(1.0)hi 0x3f490fda */
   9.8279368877e-01, /* atan(1.5)hi 0x3f7b985e */
   1.5707962513e+00, /* atan(inf)hi 0x3fc90fda */
 };
 
-#ifdef __STDC__
 static const float atanlo[] = {
-#else
-static float atanlo[] = {
-#endif
   5.0121582440e-09, /* atan(0.5)lo 0x31ac3769 */
   3.7748947079e-08, /* atan(1.0)lo 0x33222168 */
   3.4473217170e-08, /* atan(1.5)lo 0x33140fb4 */
   7.5497894159e-08, /* atan(inf)lo 0x33a22168 */
 };
 
-#ifdef __STDC__
 static const float aT[] = {
-#else
-static float aT[] = {
-#endif
   3.3333334327e-01, /* 0x3eaaaaaa */
  -2.0000000298e-01, /* 0xbe4ccccd */
   1.4285714924e-01, /* 0x3e124925 */
@@ -60,20 +48,11 @@ static float aT[] = {
   1.6285819933e-02, /* 0x3c8569d7 */
 };
 
-#ifdef __STDC__
-	static const float 
-#else
-	static float 
-#endif
+static const float
 one   = 1.0,
 huge   = 1.0e30;
 
-#ifdef __STDC__
-	float __atanf(float x)
-#else
-	float __atanf(x)
-	float x;
-#endif
+float __atanf(float x)
 {
 	float w,s1,s2,z;
 	int32_t ix,hx,id;
diff --git a/sysdeps/ieee754/flt-32/s_copysignf.c b/sysdeps/ieee754/flt-32/s_copysignf.c
index a4e84e5397..3a7893d8af 100644
--- a/sysdeps/ieee754/flt-32/s_copysignf.c
+++ b/sysdeps/ieee754/flt-32/s_copysignf.c
@@ -26,12 +26,7 @@ static char rcsid[] = "$NetBSD: s_copysignf.c,v 1.4 1995/05/10 20:46:59 jtc Exp
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
-	float __copysignf(float x, float y)
-#else
-	float __copysignf(x,y)
-	float x,y;
-#endif
+float __copysignf(float x, float y)
 {
 	u_int32_t ix,iy;
 	GET_FLOAT_WORD(ix,x);
diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
index 4f9f239f6f..dfe576c7be 100644
--- a/sysdeps/ieee754/flt-32/s_cosf.c
+++ b/sysdeps/ieee754/flt-32/s_cosf.c
@@ -21,18 +21,9 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
 static const float one=1.0;
-#else
-static float one=1.0;
-#endif
 
-#ifdef __STDC__
-	float __cosf(float x)
-#else
-	float __cosf(x)
-	float x;
-#endif
+float __cosf(float x)
 {
 	float y[2],z=0.0;
 	int32_t n,ix;
diff --git a/sysdeps/ieee754/flt-32/s_erff.c b/sysdeps/ieee754/flt-32/s_erff.c
index 774714cfd1..576618309b 100644
--- a/sysdeps/ieee754/flt-32/s_erff.c
+++ b/sysdeps/ieee754/flt-32/s_erff.c
@@ -20,11 +20,7 @@ static char rcsid[] = "$NetBSD: s_erff.c,v 1.4 1995/05/10 20:47:07 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
 static const float
-#else
-static float
-#endif
 tiny	    = 1e-30,
 half=  5.0000000000e-01, /* 0x3F000000 */
 one =  1.0000000000e+00, /* 0x3F800000 */
@@ -99,12 +95,7 @@ sb5  =  2.5530502930e+03, /* 0x451f90ce */
 sb6  =  4.7452853394e+02, /* 0x43ed43a7 */
 sb7  = -2.2440952301e+01; /* 0xc1b38712 */
 
-#ifdef __STDC__
-	float __erff(float x)
-#else
-	float __erff(x)
-	float x;
-#endif
+float __erff(float x)
 {
 	int32_t hx,ix,i;
 	float R,S,P,Q,s,y,z,r;
@@ -157,12 +148,7 @@ sb7  = -2.2440952301e+01; /* 0xc1b38712 */
 }
 weak_alias (__erff, erff)
 
-#ifdef __STDC__
-	float __erfcf(float x)
-#else
-	float __erfcf(x)
-	float x;
-#endif
+float __erfcf(float x)
 {
 	int32_t hx,ix;
 	float R,S,P,Q,s,y,z,r;
diff --git a/sysdeps/ieee754/flt-32/s_fabsf.c b/sysdeps/ieee754/flt-32/s_fabsf.c
index 6b1451379f..b6a02da184 100644
--- a/sysdeps/ieee754/flt-32/s_fabsf.c
+++ b/sysdeps/ieee754/flt-32/s_fabsf.c
@@ -24,12 +24,7 @@ static char rcsid[] = "$NetBSD: s_fabsf.c,v 1.4 1995/05/10 20:47:15 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
-	float __fabsf(float x)
-#else
-	float __fabsf(x)
-	float x;
-#endif
+float __fabsf(float x)
 {
 	u_int32_t ix;
 	GET_FLOAT_WORD(ix,x);
diff --git a/sysdeps/ieee754/flt-32/s_finitef.c b/sysdeps/ieee754/flt-32/s_finitef.c
index 2df513be75..fe4f0525fa 100644
--- a/sysdeps/ieee754/flt-32/s_finitef.c
+++ b/sysdeps/ieee754/flt-32/s_finitef.c
@@ -26,12 +26,7 @@ static char rcsid[] = "$NetBSD: s_finitef.c,v 1.4 1995/05/10 20:47:18 jtc Exp $"
 #include "math_private.h"
 
 #undef __finitef
-#ifdef __STDC__
-	int __finitef(float x)
-#else
-	int __finitef(x)
-	float x;
-#endif
+int __finitef(float x)
 {
 	int32_t ix;
 	GET_FLOAT_WORD(ix,x);
diff --git a/sysdeps/ieee754/flt-32/s_frexpf.c b/sysdeps/ieee754/flt-32/s_frexpf.c
index 7a4eb4cca4..ba3777553c 100644
--- a/sysdeps/ieee754/flt-32/s_frexpf.c
+++ b/sysdeps/ieee754/flt-32/s_frexpf.c
@@ -20,19 +20,10 @@ static char rcsid[] = "$NetBSD: s_frexpf.c,v 1.5 1995/05/10 20:47:26 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
 static const float
-#else
-static float
-#endif
 two25 =  3.3554432000e+07; /* 0x4c000000 */
 
-#ifdef __STDC__
-	float __frexpf(float x, int *eptr)
-#else
-	float __frexpf(x, eptr)
-	float x; int *eptr;
-#endif
+float __frexpf(float x, int *eptr)
 {
 	int32_t hx,ix;
 	GET_FLOAT_WORD(hx,x);
diff --git a/sysdeps/ieee754/flt-32/s_ilogbf.c b/sysdeps/ieee754/flt-32/s_ilogbf.c
index ea3dc13bcb..74babe140f 100644
--- a/sysdeps/ieee754/flt-32/s_ilogbf.c
+++ b/sysdeps/ieee754/flt-32/s_ilogbf.c
@@ -21,12 +21,7 @@ static char rcsid[] = "$NetBSD: s_ilogbf.c,v 1.4 1995/05/10 20:47:31 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
-	int __ilogbf(float x)
-#else
-	int __ilogbf(x)
-	float x;
-#endif
+int __ilogbf(float x)
 {
 	int32_t hx,ix;
 
diff --git a/sysdeps/ieee754/flt-32/s_isnanf.c b/sysdeps/ieee754/flt-32/s_isnanf.c
index 1b1b2475b9..028b9bbb35 100644
--- a/sysdeps/ieee754/flt-32/s_isnanf.c
+++ b/sysdeps/ieee754/flt-32/s_isnanf.c
@@ -26,12 +26,7 @@ static char rcsid[] = "$NetBSD: s_isnanf.c,v 1.4 1995/05/10 20:47:38 jtc Exp $";
 #include "math_private.h"
 
 #undef __isnanf
-#ifdef __STDC__
-	int __isnanf(float x)
-#else
-	int __isnanf(x)
-	float x;
-#endif
+int __isnanf(float x)
 {
 	int32_t ix;
 	GET_FLOAT_WORD(ix,x);
diff --git a/sysdeps/ieee754/flt-32/s_logbf.c b/sysdeps/ieee754/flt-32/s_logbf.c
index ade892a8f9..6504eb6c66 100644
--- a/sysdeps/ieee754/flt-32/s_logbf.c
+++ b/sysdeps/ieee754/flt-32/s_logbf.c
@@ -20,12 +20,7 @@ static char rcsid[] = "$NetBSD: s_logbf.c,v 1.4 1995/05/10 20:47:51 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
-	float __logbf(float x)
-#else
-	float __logbf(x)
-	float x;
-#endif
+float __logbf(float x)
 {
 	int32_t ix;
 	GET_FLOAT_WORD(ix,x);
diff --git a/sysdeps/ieee754/flt-32/s_nextafterf.c b/sysdeps/ieee754/flt-32/s_nextafterf.c
index 600c14621f..19da4246ac 100644
--- a/sysdeps/ieee754/flt-32/s_nextafterf.c
+++ b/sysdeps/ieee754/flt-32/s_nextafterf.c
@@ -21,12 +21,7 @@ static char rcsid[] = "$NetBSD: s_nextafterf.c,v 1.4 1995/05/10 20:48:01 jtc Exp
 #include <math_private.h>
 #include <float.h>
 
-#ifdef __STDC__
-	float __nextafterf(float x, float y)
-#else
-	float __nextafterf(x,y)
-	float x,y;
-#endif
+float __nextafterf(float x, float y)
 {
 	int32_t hx,hy,ix,iy;
 
diff --git a/sysdeps/ieee754/flt-32/s_sinf.c b/sysdeps/ieee754/flt-32/s_sinf.c
index 673e379f0c..680fe07dae 100644
--- a/sysdeps/ieee754/flt-32/s_sinf.c
+++ b/sysdeps/ieee754/flt-32/s_sinf.c
@@ -21,12 +21,7 @@ static char rcsid[] = "$NetBSD: s_sinf.c,v 1.4 1995/05/10 20:48:16 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
-	float __sinf(float x)
-#else
-	float __sinf(x)
-	float x;
-#endif
+float __sinf(float x)
 {
 	float y[2],z=0.0;
 	int32_t n, ix;
diff --git a/sysdeps/ieee754/flt-32/s_tanf.c b/sysdeps/ieee754/flt-32/s_tanf.c
index 4a852cb1f4..b69f3f5f79 100644
--- a/sysdeps/ieee754/flt-32/s_tanf.c
+++ b/sysdeps/ieee754/flt-32/s_tanf.c
@@ -21,12 +21,7 @@ static char rcsid[] = "$NetBSD: s_tanf.c,v 1.4 1995/05/10 20:48:20 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
-	float __tanf(float x)
-#else
-	float __tanf(x)
-	float x;
-#endif
+float __tanf(float x)
 {
 	float y[2],z=0.0;
 	int32_t n, ix;
diff --git a/sysdeps/ieee754/flt-32/s_tanhf.c b/sysdeps/ieee754/flt-32/s_tanhf.c
index 2a0ca9f3df..a3a2cd3e50 100644
--- a/sysdeps/ieee754/flt-32/s_tanhf.c
+++ b/sysdeps/ieee754/flt-32/s_tanhf.c
@@ -20,18 +20,9 @@ static char rcsid[] = "$NetBSD: s_tanhf.c,v 1.4 1995/05/10 20:48:24 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
 static const float one=1.0, two=2.0, tiny = 1.0e-30;
-#else
-static float one=1.0, two=2.0, tiny = 1.0e-30;
-#endif
 
-#ifdef __STDC__
-	float __tanhf(float x)
-#else
-	float __tanhf(x)
-	float x;
-#endif
+float __tanhf(float x)
 {
 	float t,z;
 	int32_t jx,ix;
-- 
cgit 1.4.1