This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch to remove KR_headers from libf2c part1
- From: "Kaveh R. Ghazi" <ghazi at caip dot rutgers dot edu>
- To: gcc-patches at gcc dot gnu dot org
- Cc: toon at moene dot indiv dot nluug dot nl
- Date: Fri, 31 May 2002 00:24:17 -0400 (EDT)
- Subject: Patch to remove KR_headers from libf2c part1
In order hopefully to make the libf2c directory more maintainable and
eventually clean up warnings, apply GNU coding/formatting standards,
etc, I'm going to remove lots of unused gunk. Here's a first stab
which gets rid of the KR_headers stuff from libF77. That code never
triggers because we always compile libf2c with gcc.
Tested on sparc-sun-solaris2.7 with: --disable-multilib --disable-nls
--disable-checking --enable-languages=c,f77
Ok to install?
Thanks,
--Kaveh
2002-05-30 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* libF77/*: Delete KR_headers cruft.
diff -rup orig/egcc-CVS20020524/libf2c/libF77/F77_aloc.c egcc-CVS20020524/libf2c/libF77/F77_aloc.c
--- orig/egcc-CVS20020524/libf2c/libF77/F77_aloc.c 1999-03-17 03:21:10.000000000 -0500
+++ egcc-CVS20020524/libf2c/libF77/F77_aloc.c 2002-05-24 20:11:18.140428581 -0400
@@ -6,13 +6,6 @@
static integer memfailure = 3;
-#ifdef KR_headers
-extern char *malloc();
-extern void G77_exit_0 ();
-
- char *
-F77_aloc(Len, whence) integer Len; char *whence;
-#else
#include <stdlib.h>
#ifdef __cplusplus
extern "C" {
@@ -24,7 +17,6 @@ extern void G77_exit_0 (integer*);
char *
F77_aloc(integer Len, char *whence)
-#endif
{
char *rv;
unsigned int uLen = (unsigned int) Len; /* for K&R C */
diff -rup orig/egcc-CVS20020524/libf2c/libF77/abort_.c egcc-CVS20020524/libf2c/libF77/abort_.c
--- orig/egcc-CVS20020524/libf2c/libF77/abort_.c 1999-05-10 10:40:52.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/abort_.c 2002-05-24 20:02:13.514994473 -0400
@@ -1,15 +1,9 @@
#include <stdio.h>
#include "f2c.h"
-#ifdef KR_headers
-extern VOID sig_die();
-
-int G77_abort_0 ()
-#else
extern void sig_die(char*,int);
int G77_abort_0 (void)
-#endif
{
sig_die("Fortran abort routine called", 1);
return 0; /* not reached */
diff -rup orig/egcc-CVS20020524/libf2c/libF77/c_abs.c egcc-CVS20020524/libf2c/libF77/c_abs.c
--- orig/egcc-CVS20020524/libf2c/libF77/c_abs.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/c_abs.c 2002-05-24 20:02:27.383680178 -0400
@@ -1,14 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-extern double f__cabs();
-
-double c_abs(z) complex *z;
-#else
extern double f__cabs(double, double);
double c_abs(complex *z)
-#endif
{
return( f__cabs( z->r, z->i ) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/c_cos.c egcc-CVS20020524/libf2c/libF77/c_cos.c
--- orig/egcc-CVS20020524/libf2c/libF77/c_cos.c 1999-05-03 04:35:07.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/c_cos.c 2002-05-24 20:03:28.397487114 -0400
@@ -1,15 +1,9 @@
#include "f2c.h"
-#ifdef KR_headers
-extern double sin(), cos(), sinh(), cosh();
-
-VOID c_cos(r, z) complex *r, *z;
-#else
#undef abs
#include "math.h"
void c_cos(complex *r, complex *z)
-#endif
{
double zi = z->i, zr = z->r;
r->r = cos(zr) * cosh(zi);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/c_div.c egcc-CVS20020524/libf2c/libF77/c_div.c
--- orig/egcc-CVS20020524/libf2c/libF77/c_div.c 2000-03-12 14:20:47.000000000 -0500
+++ egcc-CVS20020524/libf2c/libF77/c_div.c 2002-05-24 20:02:45.861757636 -0400
@@ -1,13 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-extern VOID sig_die();
-VOID c_div(c, a, b)
-complex *a, *b, *c;
-#else
extern void sig_die(char*,int);
void c_div(complex *c, complex *a, complex *b)
-#endif
{
double ratio, den;
double abr, abi, cr;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/c_exp.c egcc-CVS20020524/libf2c/libF77/c_exp.c
--- orig/egcc-CVS20020524/libf2c/libF77/c_exp.c 1999-05-03 04:35:08.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/c_exp.c 2002-05-24 20:03:59.054338163 -0400
@@ -1,15 +1,9 @@
#include "f2c.h"
-#ifdef KR_headers
-extern double exp(), cos(), sin();
-
- VOID c_exp(r, z) complex *r, *z;
-#else
#undef abs
#include "math.h"
void c_exp(complex *r, complex *z)
-#endif
{
double expx, zi = z->i;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/c_log.c egcc-CVS20020524/libf2c/libF77/c_log.c
--- orig/egcc-CVS20020524/libf2c/libF77/c_log.c 1999-05-10 10:40:53.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/c_log.c 2002-05-24 20:03:16.958607581 -0400
@@ -1,15 +1,10 @@
#include "f2c.h"
-#ifdef KR_headers
-extern double log(), f__cabs(), atan2();
-VOID c_log(r, z) complex *r, *z;
-#else
#undef abs
#include "math.h"
extern double f__cabs(double, double);
void c_log(complex *r, complex *z)
-#endif
{
double zi, zr;
r->i = atan2(zi = z->i, zr = z->r);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/c_sin.c egcc-CVS20020524/libf2c/libF77/c_sin.c
--- orig/egcc-CVS20020524/libf2c/libF77/c_sin.c 1999-05-03 04:35:09.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/c_sin.c 2002-05-24 20:03:44.705757172 -0400
@@ -1,15 +1,9 @@
#include "f2c.h"
-#ifdef KR_headers
-extern double sin(), cos(), sinh(), cosh();
-
-VOID c_sin(r, z) complex *r, *z;
-#else
#undef abs
#include "math.h"
void c_sin(complex *r, complex *z)
-#endif
{
double zi = z->i, zr = z->r;
r->r = sin(zr) * cosh(zi);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/c_sqrt.c egcc-CVS20020524/libf2c/libF77/c_sqrt.c
--- orig/egcc-CVS20020524/libf2c/libF77/c_sqrt.c 1999-05-03 04:33:12.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/c_sqrt.c 2002-05-24 20:04:09.193323399 -0400
@@ -1,16 +1,10 @@
#include "f2c.h"
-#ifdef KR_headers
-extern double sqrt(), f__cabs();
-
-VOID c_sqrt(r, z) complex *r, *z;
-#else
#undef abs
#include "math.h"
extern double f__cabs(double, double);
void c_sqrt(complex *r, complex *z)
-#endif
{
double mag, t;
double zi = z->i, zr = z->r;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/cabs.c egcc-CVS20020524/libf2c/libF77/cabs.c
--- orig/egcc-CVS20020524/libf2c/libF77/cabs.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/cabs.c 2002-05-24 20:04:16.252617202 -0400
@@ -1,11 +1,6 @@
-#ifdef KR_headers
-extern double sqrt();
-double f__cabs(real, imag) double real, imag;
-#else
#undef abs
#include <math.h>
double f__cabs(double real, double imag)
-#endif
{
double temp;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/configure.in egcc-CVS20020524/libf2c/libF77/configure.in
--- orig/egcc-CVS20020524/libf2c/libF77/configure.in 2001-12-04 07:31:47.000000000 -0500
+++ egcc-CVS20020524/libf2c/libF77/configure.in 2002-05-24 20:10:50.073196402 -0400
@@ -56,17 +56,6 @@ the G77 runtime system. If necessary, i
then the target library, then build with \`LANGUAGES=f77'.])])
AC_HEADER_STDC
-dnl We could do this if we didn't know we were using gcc
-dnl AC_MSG_CHECKING(for prototype-savvy compiler)
-dnl AC_CACHE_VAL(g77_cv_sys_proto,
-dnl [AC_TRY_LINK(,
-dnl dnl looks screwy because TRY_LINK expects a function body
-dnl [return 0;} int foo (int * bar) {],
-dnl g77_cv_sys_proto=yes,
-dnl [g77_cv_sys_proto=no
-dnl AC_DEFINE(KR_headers)])])
-dnl AC_MSG_RESULT($g77_cv_sys_proto)
-
AC_MSG_CHECKING(for posix)
AC_CACHE_VAL(g77_cv_header_posix,
AC_EGREP_CPP(yes,
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_abs.c egcc-CVS20020524/libf2c/libF77/d_abs.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_abs.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_abs.c 2002-05-24 20:04:35.200716468 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-double d_abs(x) doublereal *x;
-#else
double d_abs(doublereal *x)
-#endif
{
if(*x >= 0)
return(*x);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_acos.c egcc-CVS20020524/libf2c/libF77/d_acos.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_acos.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_acos.c 2002-05-24 20:05:02.687918932 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double acos();
-double d_acos(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_acos(doublereal *x)
-#endif
{
return( acos(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_asin.c egcc-CVS20020524/libf2c/libF77/d_asin.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_asin.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_asin.c 2002-05-24 20:04:53.038915292 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double asin();
-double d_asin(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_asin(doublereal *x)
-#endif
{
return( asin(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_atan.c egcc-CVS20020524/libf2c/libF77/d_atan.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_atan.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_atan.c 2002-05-24 20:05:14.386822481 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double atan();
-double d_atan(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_atan(doublereal *x)
-#endif
{
return( atan(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_atn2.c egcc-CVS20020524/libf2c/libF77/d_atn2.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_atn2.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_atn2.c 2002-05-24 20:05:27.405519211 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double atan2();
-double d_atn2(x,y) doublereal *x, *y;
-#else
#undef abs
#include <math.h>
double d_atn2(doublereal *x, doublereal *y)
-#endif
{
return( atan2(*x,*y) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_cnjg.c egcc-CVS20020524/libf2c/libF77/d_cnjg.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_cnjg.c 1999-05-03 04:35:10.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_cnjg.c 2002-05-24 20:05:45.363719514 -0400
@@ -1,11 +1,7 @@
#include "f2c.h"
VOID
-#ifdef KR_headers
-d_cnjg(r, z) doublecomplex *r, *z;
-#else
d_cnjg(doublecomplex *r, doublecomplex *z)
-#endif
{
doublereal zi = z->i;
r->r = z->r;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_cos.c egcc-CVS20020524/libf2c/libF77/d_cos.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_cos.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_cos.c 2002-05-24 20:06:01.612011910 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double cos();
-double d_cos(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_cos(doublereal *x)
-#endif
{
return( cos(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_cosh.c egcc-CVS20020524/libf2c/libF77/d_cosh.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_cosh.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_cosh.c 2002-05-24 20:06:12.131012162 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double cosh();
-double d_cosh(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_cosh(doublereal *x)
-#endif
{
return( cosh(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_dim.c egcc-CVS20020524/libf2c/libF77/d_dim.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_dim.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_dim.c 2002-05-24 20:06:21.840012922 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-double d_dim(a,b) doublereal *a, *b;
-#else
double d_dim(doublereal *a, doublereal *b)
-#endif
{
return( *a > *b ? *a - *b : 0);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_exp.c egcc-CVS20020524/libf2c/libF77/d_exp.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_exp.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_exp.c 2002-05-24 20:06:30.799111640 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double exp();
-double d_exp(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_exp(doublereal *x)
-#endif
{
return( exp(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_imag.c egcc-CVS20020524/libf2c/libF77/d_imag.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_imag.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_imag.c 2002-05-24 20:06:41.048116860 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-double d_imag(z) doublecomplex *z;
-#else
double d_imag(doublecomplex *z)
-#endif
{
return(z->i);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_int.c egcc-CVS20020524/libf2c/libF77/d_int.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_int.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_int.c 2002-05-24 20:06:48.277414914 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double floor();
-double d_int(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_int(doublereal *x)
-#endif
{
return( (*x>0) ? floor(*x) : -floor(- *x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_lg10.c egcc-CVS20020524/libf2c/libF77/d_lg10.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_lg10.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_lg10.c 2002-05-24 20:07:01.986015085 -0400
@@ -2,14 +2,9 @@
#define log10e 0.43429448190325182765
-#ifdef KR_headers
-double log();
-double d_lg10(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_lg10(doublereal *x)
-#endif
{
return( log10e * log(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_log.c egcc-CVS20020524/libf2c/libF77/d_log.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_log.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_log.c 2002-05-24 20:07:33.172913791 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double log();
-double d_log(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_log(doublereal *x)
-#endif
{
return( log(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_mod.c egcc-CVS20020524/libf2c/libF77/d_mod.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_mod.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_mod.c 2002-05-24 20:08:20.298189932 -0400
@@ -1,13 +1,5 @@
#include "f2c.h"
-#ifdef KR_headers
-#ifdef IEEE_drem
-double drem();
-#else
-double floor();
-#endif
-double d_mod(x,y) doublereal *x, *y;
-#else
#ifdef IEEE_drem
double drem(double, double);
#else
@@ -15,7 +7,6 @@ double drem(double, double);
#include <math.h>
#endif
double d_mod(doublereal *x, doublereal *y)
-#endif
{
#ifdef IEEE_drem
double xa, ya, z;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_nint.c egcc-CVS20020524/libf2c/libF77/d_nint.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_nint.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_nint.c 2002-05-24 20:08:30.927086350 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double floor();
-double d_nint(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_nint(doublereal *x)
-#endif
{
return( (*x)>=0 ?
floor(*x + .5) : -floor(.5 - *x) );
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_prod.c egcc-CVS20020524/libf2c/libF77/d_prod.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_prod.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_prod.c 2002-05-24 20:08:39.956186665 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-double d_prod(x,y) real *x, *y;
-#else
double d_prod(real *x, real *y)
-#endif
{
return( (*x) * (*y) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_sign.c egcc-CVS20020524/libf2c/libF77/d_sign.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_sign.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_sign.c 2002-05-24 20:08:48.335388784 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-double d_sign(a,b) doublereal *a, *b;
-#else
double d_sign(doublereal *a, doublereal *b)
-#endif
{
double x;
x = (*a >= 0 ? *a : - *a);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_sin.c egcc-CVS20020524/libf2c/libF77/d_sin.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_sin.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_sin.c 2002-05-24 20:08:58.704281671 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double sin();
-double d_sin(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_sin(doublereal *x)
-#endif
{
return( sin(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_sinh.c egcc-CVS20020524/libf2c/libF77/d_sinh.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_sinh.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_sinh.c 2002-05-24 20:09:08.703282895 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double sinh();
-double d_sinh(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_sinh(doublereal *x)
-#endif
{
return( sinh(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_sqrt.c egcc-CVS20020524/libf2c/libF77/d_sqrt.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_sqrt.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_sqrt.c 2002-05-24 20:09:17.272486604 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double sqrt();
-double d_sqrt(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_sqrt(doublereal *x)
-#endif
{
return( sqrt(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_tan.c egcc-CVS20020524/libf2c/libF77/d_tan.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_tan.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_tan.c 2002-05-24 20:09:32.340979916 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double tan();
-double d_tan(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_tan(doublereal *x)
-#endif
{
return( tan(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/d_tanh.c egcc-CVS20020524/libf2c/libF77/d_tanh.c
--- orig/egcc-CVS20020524/libf2c/libF77/d_tanh.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/d_tanh.c 2002-05-24 20:09:40.030176547 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double tanh();
-double d_tanh(x) doublereal *x;
-#else
#undef abs
#include <math.h>
double d_tanh(doublereal *x)
-#endif
{
return( tanh(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/derf_.c egcc-CVS20020524/libf2c/libF77/derf_.c
--- orig/egcc-CVS20020524/libf2c/libF77/derf_.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/derf_.c 2002-05-24 20:09:50.899072986 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-double erf();
-double G77_derf_0 (x) doublereal *x;
-#else
extern double erf(double);
double G77_derf_0 (doublereal *x)
-#endif
{
return( erf(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/derfc_.c egcc-CVS20020524/libf2c/libF77/derfc_.c
--- orig/egcc-CVS20020524/libf2c/libF77/derfc_.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/derfc_.c 2002-05-24 20:09:57.618374398 -0400
@@ -1,14 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-extern double erfc();
-
-double G77_derfc_0 (x) doublereal *x;
-#else
extern double erfc(double);
double G77_derfc_0 (doublereal *x)
-#endif
{
return( erfc(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/dtime_.c egcc-CVS20020524/libf2c/libF77/dtime_.c
--- orig/egcc-CVS20020524/libf2c/libF77/dtime_.c 2000-12-09 10:34:53.000000000 -0500
+++ egcc-CVS20020524/libf2c/libF77/dtime_.c 2002-05-24 20:10:07.217477880 -0400
@@ -24,11 +24,7 @@
#endif
double
-#ifdef KR_headers
-dtime_(tarray) float *tarray;
-#else
dtime_(float *tarray)
-#endif
{
#ifdef USE_CLOCK
#ifndef CLOCKS_PER_SECOND
diff -rup orig/egcc-CVS20020524/libf2c/libF77/ef1asc_.c egcc-CVS20020524/libf2c/libF77/ef1asc_.c
--- orig/egcc-CVS20020524/libf2c/libF77/ef1asc_.c 1999-05-10 10:40:54.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/ef1asc_.c 2002-05-24 20:12:27.343864144 -0400
@@ -6,13 +6,8 @@
#define M ( (long) (sizeof(long) - 1) )
#define EVEN(x) ( ( (x)+ M) & (~M) )
-#ifdef KR_headers
-extern VOID s_copy();
-G77_ef1asc_0 (a, la, b, lb) ftnint *a, *b; ftnlen *la, *lb;
-#else
extern void s_copy(char*,char*,ftnlen,ftnlen);
int G77_ef1asc_0 (ftnint *a, ftnlen *la, ftnint *b, ftnlen *lb)
-#endif
{
s_copy( (char *)a, (char *)b, EVEN(*la), *lb );
return 0; /* ignored return value */
diff -rup orig/egcc-CVS20020524/libf2c/libF77/ef1cmc_.c egcc-CVS20020524/libf2c/libF77/ef1cmc_.c
--- orig/egcc-CVS20020524/libf2c/libF77/ef1cmc_.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/ef1cmc_.c 2002-05-24 20:12:40.322675627 -0400
@@ -2,13 +2,8 @@
#include "f2c.h"
-#ifdef KR_headers
-extern integer s_cmp();
-integer G77_ef1cmc_0 (a, la, b, lb) ftnint *a, *b; ftnlen *la, *lb;
-#else
extern integer s_cmp(char*,char*,ftnlen,ftnlen);
integer G77_ef1cmc_0 (ftnint *a, ftnlen *la, ftnint *b, ftnlen *lb)
-#endif
{
return( s_cmp( (char *)a, (char *)b, *la, *lb) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/erf_.c egcc-CVS20020524/libf2c/libF77/erf_.c
--- orig/egcc-CVS20020524/libf2c/libF77/erf_.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/erf_.c 2002-05-24 20:12:52.201539218 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-double erf();
-double G77_erf_0 (x) real *x;
-#else
extern double erf(double);
double G77_erf_0 (real *x)
-#endif
{
return( erf(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/erfc_.c egcc-CVS20020524/libf2c/libF77/erfc_.c
--- orig/egcc-CVS20020524/libf2c/libF77/erfc_.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/erfc_.c 2002-05-24 20:13:02.160580695 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-double erfc();
-double G77_erfc_0 (x) real *x;
-#else
extern double erfc(double);
double G77_erfc_0 (real *x)
-#endif
{
return( erfc(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/etime_.c egcc-CVS20020524/libf2c/libF77/etime_.c
--- orig/egcc-CVS20020524/libf2c/libF77/etime_.c 2000-12-09 10:34:53.000000000 -0500
+++ egcc-CVS20020524/libf2c/libF77/etime_.c 2002-05-24 20:13:09.459803324 -0400
@@ -24,11 +24,7 @@
#endif
double
-#ifdef KR_headers
-etime_(tarray) float *tarray;
-#else
etime_(float *tarray)
-#endif
{
#ifdef USE_CLOCK
#ifndef CLOCKS_PER_SECOND
diff -rup orig/egcc-CVS20020524/libf2c/libF77/exit_.c egcc-CVS20020524/libf2c/libF77/exit_.c
--- orig/egcc-CVS20020524/libf2c/libF77/exit_.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/exit_.c 2002-05-24 20:13:48.556007685 -0400
@@ -12,20 +12,14 @@
#undef abs
#undef min
#undef max
-#ifndef KR_headers
#include <stdlib.h>
#ifdef __cplusplus
extern "C" {
#endif
extern void f_exit(void);
-#endif
void
-#ifdef KR_headers
-G77_exit_0 (rc) integer *rc;
-#else
G77_exit_0 (integer *rc)
-#endif
{
#ifdef NO_ONEXIT
f_exit();
diff -rup orig/egcc-CVS20020524/libf2c/libF77/getarg_.c egcc-CVS20020524/libf2c/libF77/getarg_.c
--- orig/egcc-CVS20020524/libf2c/libF77/getarg_.c 1998-05-22 06:31:09.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/getarg_.c 2002-05-24 20:14:09.583945948 -0400
@@ -6,11 +6,7 @@
* variable argument c
*/
-#ifdef KR_headers
-VOID G77_getarg_0 (n, s, ls) ftnint *n; register char *s; ftnlen ls;
-#else
void G77_getarg_0 (ftnint *n, register char *s, ftnlen ls)
-#endif
{
extern int f__xargc;
extern char **f__xargv;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/getenv_.c egcc-CVS20020524/libf2c/libF77/getenv_.c
--- orig/egcc-CVS20020524/libf2c/libF77/getenv_.c 1999-05-03 04:35:13.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/getenv_.c 2002-05-24 20:14:29.691964920 -0400
@@ -1,12 +1,8 @@
#include "f2c.h"
#undef abs
-#ifdef KR_headers
-extern char *F77_aloc(), *getenv();
-#else
#include <stdlib.h>
#include <string.h>
extern char *F77_aloc(ftnlen, char*);
-#endif
/*
* getenv - f77 subroutine to return environment variables
@@ -20,13 +16,8 @@ extern char *F77_aloc(ftnlen, char*);
* if ENV_NAME is not defined
*/
-#ifdef KR_headers
- VOID
-G77_getenv_0 (fname, value, flen, vlen) char *value, *fname; ftnlen vlen, flen;
-#else
void
G77_getenv_0 (char *fname, char *value, ftnlen flen, ftnlen vlen)
-#endif
{
char buf[256], *ep, *fp;
integer i;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/h_abs.c egcc-CVS20020524/libf2c/libF77/h_abs.c
--- orig/egcc-CVS20020524/libf2c/libF77/h_abs.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/h_abs.c 2002-05-24 20:14:46.850284162 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-shortint h_abs(x) shortint *x;
-#else
shortint h_abs(shortint *x)
-#endif
{
if(*x >= 0)
return(*x);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/h_dim.c egcc-CVS20020524/libf2c/libF77/h_dim.c
--- orig/egcc-CVS20020524/libf2c/libF77/h_dim.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/h_dim.c 2002-05-24 20:14:54.379597045 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-shortint h_dim(a,b) shortint *a, *b;
-#else
shortint h_dim(shortint *a, shortint *b)
-#endif
{
return( *a > *b ? *a - *b : 0);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/h_dnnt.c egcc-CVS20020524/libf2c/libF77/h_dnnt.c
--- orig/egcc-CVS20020524/libf2c/libF77/h_dnnt.c 1998-05-19 06:50:54.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/h_dnnt.c 2002-05-24 20:15:02.198799851 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double floor();
-shortint h_dnnt(x) doublereal *x;
-#else
#undef abs
#include <math.h>
shortint h_dnnt(doublereal *x)
-#endif
{
return (shortint)(*x >= 0. ? floor(*x + .5) : -floor(.5 - *x));
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/h_indx.c egcc-CVS20020524/libf2c/libF77/h_indx.c
--- orig/egcc-CVS20020524/libf2c/libF77/h_indx.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/h_indx.c 2002-05-24 20:15:08.738103874 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-shortint h_indx(a, b, la, lb) char *a, *b; ftnlen la, lb;
-#else
shortint h_indx(char *a, char *b, ftnlen la, ftnlen lb)
-#endif
{
ftnlen i, n;
char *s, *t, *bend;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/h_len.c egcc-CVS20020524/libf2c/libF77/h_len.c
--- orig/egcc-CVS20020524/libf2c/libF77/h_len.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/h_len.c 2002-05-24 20:15:17.247316458 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-shortint h_len(s, n) char *s; ftnlen n;
-#else
shortint h_len(char *s, ftnlen n)
-#endif
{
return(n);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/h_mod.c egcc-CVS20020524/libf2c/libF77/h_mod.c
--- orig/egcc-CVS20020524/libf2c/libF77/h_mod.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/h_mod.c 2002-05-24 20:15:23.486615748 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-shortint h_mod(a,b) short *a, *b;
-#else
shortint h_mod(short *a, short *b)
-#endif
{
return( *a % *b);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/h_nint.c egcc-CVS20020524/libf2c/libF77/h_nint.c
--- orig/egcc-CVS20020524/libf2c/libF77/h_nint.c 1998-05-19 06:50:55.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/h_nint.c 2002-05-24 20:15:31.945827485 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double floor();
-shortint h_nint(x) real *x;
-#else
#undef abs
#include <math.h>
shortint h_nint(real *x)
-#endif
{
return (shortint)(*x >= 0 ? floor(*x + .5) : -floor(.5 - *x));
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/h_sign.c egcc-CVS20020524/libf2c/libF77/h_sign.c
--- orig/egcc-CVS20020524/libf2c/libF77/h_sign.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/h_sign.c 2002-05-24 20:15:43.034731550 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-shortint h_sign(a,b) shortint *a, *b;
-#else
shortint h_sign(shortint *a, shortint *b)
-#endif
{
shortint x;
x = (*a >= 0 ? *a : - *a);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/hl_ge.c egcc-CVS20020524/libf2c/libF77/hl_ge.c
--- orig/egcc-CVS20020524/libf2c/libF77/hl_ge.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/hl_ge.c 2002-05-24 20:15:51.983849926 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-extern integer s_cmp();
-shortlogical hl_ge(a,b,la,lb) char *a, *b; ftnlen la, lb;
-#else
extern integer s_cmp(char *, char *, ftnlen, ftnlen);
shortlogical hl_ge(char *a, char *b, ftnlen la, ftnlen lb)
-#endif
{
return(s_cmp(a,b,la,lb) >= 0);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/hl_gt.c egcc-CVS20020524/libf2c/libF77/hl_gt.c
--- orig/egcc-CVS20020524/libf2c/libF77/hl_gt.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/hl_gt.c 2002-05-24 20:15:59.103152256 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-extern integer s_cmp();
-shortlogical hl_gt(a,b,la,lb) char *a, *b; ftnlen la, lb;
-#else
extern integer s_cmp(char *, char *, ftnlen, ftnlen);
shortlogical hl_gt(char *a, char *b, ftnlen la, ftnlen lb)
-#endif
{
return(s_cmp(a,b,la,lb) > 0);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/hl_le.c egcc-CVS20020524/libf2c/libF77/hl_le.c
--- orig/egcc-CVS20020524/libf2c/libF77/hl_le.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/hl_le.c 2002-05-24 20:16:05.202556351 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-extern integer s_cmp();
-shortlogical hl_le(a,b,la,lb) char *a, *b; ftnlen la, lb;
-#else
extern integer s_cmp(char *, char *, ftnlen, ftnlen);
shortlogical hl_le(char *a, char *b, ftnlen la, ftnlen lb)
-#endif
{
return(s_cmp(a,b,la,lb) <= 0);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/hl_lt.c egcc-CVS20020524/libf2c/libF77/hl_lt.c
--- orig/egcc-CVS20020524/libf2c/libF77/hl_lt.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/hl_lt.c 2002-05-24 20:16:11.431963773 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-extern integer s_cmp();
-shortlogical hl_lt(a,b,la,lb) char *a, *b; ftnlen la, lb;
-#else
extern integer s_cmp(char *, char *, ftnlen, ftnlen);
shortlogical hl_lt(char *a, char *b, ftnlen la, ftnlen lb)
-#endif
{
return(s_cmp(a,b,la,lb) < 0);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/i_abs.c egcc-CVS20020524/libf2c/libF77/i_abs.c
--- orig/egcc-CVS20020524/libf2c/libF77/i_abs.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/i_abs.c 2002-05-24 20:16:19.771065114 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-integer i_abs(x) integer *x;
-#else
integer i_abs(integer *x)
-#endif
{
if(*x >= 0)
return(*x);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/i_dim.c egcc-CVS20020524/libf2c/libF77/i_dim.c
--- orig/egcc-CVS20020524/libf2c/libF77/i_dim.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/i_dim.c 2002-05-24 20:16:42.928783483 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-integer i_dim(a,b) integer *a, *b;
-#else
integer i_dim(integer *a, integer *b)
-#endif
{
return( *a > *b ? *a - *b : 0);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/i_dnnt.c egcc-CVS20020524/libf2c/libF77/i_dnnt.c
--- orig/egcc-CVS20020524/libf2c/libF77/i_dnnt.c 1998-05-19 06:50:56.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/i_dnnt.c 2002-05-24 20:16:50.487977585 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double floor();
-integer i_dnnt(x) doublereal *x;
-#else
#undef abs
#include <math.h>
integer i_dnnt(doublereal *x)
-#endif
{
return (integer)(*x >= 0. ? floor(*x + .5) : -floor(.5 - *x));
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/i_indx.c egcc-CVS20020524/libf2c/libF77/i_indx.c
--- orig/egcc-CVS20020524/libf2c/libF77/i_indx.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/i_indx.c 2002-05-24 20:17:14.655601037 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-integer i_indx(a, b, la, lb) char *a, *b; ftnlen la, lb;
-#else
integer i_indx(char *a, char *b, ftnlen la, ftnlen lb)
-#endif
{
ftnlen i, n;
char *s, *t, *bend;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/i_len.c egcc-CVS20020524/libf2c/libF77/i_len.c
--- orig/egcc-CVS20020524/libf2c/libF77/i_len.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/i_len.c 2002-05-24 20:17:43.712668295 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-integer i_len(s, n) char *s; ftnlen n;
-#else
integer i_len(char *s, ftnlen n)
-#endif
{
return(n);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/i_mod.c egcc-CVS20020524/libf2c/libF77/i_mod.c
--- orig/egcc-CVS20020524/libf2c/libF77/i_mod.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/i_mod.c 2002-05-24 20:17:36.803376842 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-integer i_mod(a,b) integer *a, *b;
-#else
integer i_mod(integer *a, integer *b)
-#endif
{
return( *a % *b);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/i_nint.c egcc-CVS20020524/libf2c/libF77/i_nint.c
--- orig/egcc-CVS20020524/libf2c/libF77/i_nint.c 1998-05-19 06:50:57.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/i_nint.c 2002-05-24 20:17:21.464885559 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double floor();
-integer i_nint(x) real *x;
-#else
#undef abs
#include <math.h>
integer i_nint(real *x)
-#endif
{
return (integer)(*x >= 0 ? floor(*x + .5) : -floor(.5 - *x));
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/i_sign.c egcc-CVS20020524/libf2c/libF77/i_sign.c
--- orig/egcc-CVS20020524/libf2c/libF77/i_sign.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/i_sign.c 2002-05-24 20:17:27.704289466 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-integer i_sign(a,b) integer *a, *b;
-#else
integer i_sign(integer *a, integer *b)
-#endif
{
integer x;
x = (*a >= 0 ? *a : - *a);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/iargc_.c egcc-CVS20020524/libf2c/libF77/iargc_.c
--- orig/egcc-CVS20020524/libf2c/libF77/iargc_.c 1998-05-22 06:31:10.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/iargc_.c 2002-05-24 20:17:53.141758283 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-ftnint G77_iargc_0 ()
-#else
ftnint G77_iargc_0 (void)
-#endif
{
extern int f__xargc;
return ( f__xargc - 1 );
diff -rup orig/egcc-CVS20020524/libf2c/libF77/l_ge.c egcc-CVS20020524/libf2c/libF77/l_ge.c
--- orig/egcc-CVS20020524/libf2c/libF77/l_ge.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/l_ge.c 2002-05-24 20:18:11.389924524 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-extern integer s_cmp();
-logical l_ge(a,b,la,lb) char *a, *b; ftnlen la, lb;
-#else
extern integer s_cmp(char *, char *, ftnlen, ftnlen);
logical l_ge(char *a, char *b, ftnlen la, ftnlen lb)
-#endif
{
return(s_cmp(a,b,la,lb) >= 0);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/l_gt.c egcc-CVS20020524/libf2c/libF77/l_gt.c
--- orig/egcc-CVS20020524/libf2c/libF77/l_gt.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/l_gt.c 2002-05-24 20:18:21.668809032 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-extern integer s_cmp();
-logical l_gt(a,b,la,lb) char *a, *b; ftnlen la, lb;
-#else
extern integer s_cmp(char *, char *, ftnlen, ftnlen);
logical l_gt(char *a, char *b, ftnlen la, ftnlen lb)
-#endif
{
return(s_cmp(a,b,la,lb) > 0);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/l_le.c egcc-CVS20020524/libf2c/libF77/l_le.c
--- orig/egcc-CVS20020524/libf2c/libF77/l_le.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/l_le.c 2002-05-24 20:18:29.058092275 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-extern integer s_cmp();
-logical l_le(a,b,la,lb) char *a, *b; ftnlen la, lb;
-#else
extern integer s_cmp(char *, char *, ftnlen, ftnlen);
logical l_le(char *a, char *b, ftnlen la, ftnlen lb)
-#endif
{
return(s_cmp(a,b,la,lb) <= 0);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/l_lt.c egcc-CVS20020524/libf2c/libF77/l_lt.c
--- orig/egcc-CVS20020524/libf2c/libF77/l_lt.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/l_lt.c 2002-05-24 20:18:36.787284097 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-extern integer s_cmp();
-logical l_lt(a,b,la,lb) char *a, *b; ftnlen la, lb;
-#else
extern integer s_cmp(char *, char *, ftnlen, ftnlen);
logical l_lt(char *a, char *b, ftnlen la, ftnlen lb)
-#endif
{
return(s_cmp(a,b,la,lb) < 0);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/lbitbits.c egcc-CVS20020524/libf2c/libF77/lbitbits.c
--- orig/egcc-CVS20020524/libf2c/libF77/lbitbits.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/lbitbits.c 2002-05-24 20:19:04.284538347 -0400
@@ -5,11 +5,7 @@
#endif
integer
-#ifdef KR_headers
-lbit_bits(a, b, len) integer a, b, len;
-#else
lbit_bits(integer a, integer b, integer len)
-#endif
{
/* Assume 2's complement arithmetic */
@@ -23,11 +19,7 @@ lbit_bits(integer a, integer b, integer
}
integer
-#ifdef KR_headers
-lbit_cshift(a, b, len) integer a, b, len;
-#else
lbit_cshift(integer a, integer b, integer len)
-#endif
{
unsigned long x, y, z;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/lbitshft.c egcc-CVS20020524/libf2c/libF77/lbitshft.c
--- orig/egcc-CVS20020524/libf2c/libF77/lbitshft.c 1999-09-04 11:09:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/lbitshft.c 2002-05-24 20:19:12.283726786 -0400
@@ -1,11 +1,7 @@
#include "f2c.h"
integer
-#ifdef KR_headers
-lbit_shift(a, b) integer a; integer b;
-#else
lbit_shift(integer a, integer b)
-#endif
{
return b >= 0 ? a << b : (integer)((uinteger)a >> -b);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/main.c egcc-CVS20020524/libf2c/libF77/main.c
--- orig/egcc-CVS20020524/libf2c/libF77/main.c 1998-05-22 06:31:11.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/main.c 2002-05-24 20:22:53.371591042 -0400
@@ -3,10 +3,8 @@
#include <stdio.h>
#include "signal1.h"
-#ifndef KR_headers
#undef VOID
#include <stdlib.h>
-#endif
#ifndef VOID
#define VOID void
@@ -16,41 +14,20 @@
extern "C" {
#endif
-#ifdef NO__STDC
-#define ONEXIT onexit
-extern VOID f_exit();
-#else
-#ifndef KR_headers
extern void f_exit(void);
#ifndef NO_ONEXIT
#define ONEXIT atexit
extern int atexit(void (*)(void));
#endif
-#else
-#ifndef NO_ONEXIT
-#define ONEXIT onexit
-extern VOID f_exit();
-#endif
-#endif
-#endif
-#ifdef KR_headers
-extern VOID f_init();
-extern int MAIN__();
-#else
extern void f_init(void);
extern int MAIN__(void);
-#endif
#ifdef __cplusplus
}
#endif
-#ifdef KR_headers
-main(argc, argv) int argc; char **argv;
-#else
main(int argc, char **argv)
-#endif
{
f_setarg(argc, argv);
f_setsig();
diff -rup orig/egcc-CVS20020524/libf2c/libF77/pow_ci.c egcc-CVS20020524/libf2c/libF77/pow_ci.c
--- orig/egcc-CVS20020524/libf2c/libF77/pow_ci.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/pow_ci.c 2002-05-24 20:23:39.596829204 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-VOID pow_ci(p, a, b) /* p = a**b */
- complex *p, *a; integer *b;
-#else
extern void pow_zi(doublecomplex*, doublecomplex*, integer*);
void pow_ci(complex *p, complex *a, integer *b) /* p = a**b */
-#endif
{
doublecomplex p1, a1;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/pow_dd.c egcc-CVS20020524/libf2c/libF77/pow_dd.c
--- orig/egcc-CVS20020524/libf2c/libF77/pow_dd.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/pow_dd.c 2002-05-24 20:23:47.466009015 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double pow();
-double pow_dd(ap, bp) doublereal *ap, *bp;
-#else
#undef abs
#include <math.h>
double pow_dd(doublereal *ap, doublereal *bp)
-#endif
{
return(pow(*ap, *bp) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/pow_di.c egcc-CVS20020524/libf2c/libF77/pow_di.c
--- orig/egcc-CVS20020524/libf2c/libF77/pow_di.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/pow_di.c 2002-05-24 20:24:45.970193617 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-double pow_di(ap, bp) doublereal *ap; integer *bp;
-#else
double pow_di(doublereal *ap, integer *bp)
-#endif
{
double pow, x;
integer n;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/pow_hh.c egcc-CVS20020524/libf2c/libF77/pow_hh.c
--- orig/egcc-CVS20020524/libf2c/libF77/pow_hh.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/pow_hh.c 2002-05-24 20:24:54.199447824 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-shortint pow_hh(ap, bp) shortint *ap, *bp;
-#else
shortint pow_hh(shortint *ap, shortint *bp)
-#endif
{
shortint pow, x, n;
unsigned u;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/pow_ii.c egcc-CVS20020524/libf2c/libF77/pow_ii.c
--- orig/egcc-CVS20020524/libf2c/libF77/pow_ii.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/pow_ii.c 2002-05-24 20:24:59.868851581 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-integer pow_ii(ap, bp) integer *ap, *bp;
-#else
integer pow_ii(integer *ap, integer *bp)
-#endif
{
integer pow, x, n;
unsigned long u;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/pow_qq.c egcc-CVS20020524/libf2c/libF77/pow_qq.c
--- orig/egcc-CVS20020524/libf2c/libF77/pow_qq.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/pow_qq.c 2002-05-24 20:25:06.248273011 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-longint pow_qq(ap, bp) longint *ap, *bp;
-#else
longint pow_qq(longint *ap, longint *bp)
-#endif
{
longint pow, x, n;
unsigned long long u; /* system-dependent */
diff -rup orig/egcc-CVS20020524/libf2c/libF77/pow_ri.c egcc-CVS20020524/libf2c/libF77/pow_ri.c
--- orig/egcc-CVS20020524/libf2c/libF77/pow_ri.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/pow_ri.c 2002-05-24 20:25:14.277456679 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-double pow_ri(ap, bp) real *ap; integer *bp;
-#else
double pow_ri(real *ap, integer *bp)
-#endif
{
double pow, x;
integer n;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/pow_zi.c egcc-CVS20020524/libf2c/libF77/pow_zi.c
--- orig/egcc-CVS20020524/libf2c/libF77/pow_zi.c 1999-05-03 04:33:14.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/pow_zi.c 2002-05-24 20:25:22.836576692 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-VOID pow_zi(p, a, b) /* p = a**b */
- doublecomplex *p, *a; integer *b;
-#else
extern void z_div(doublecomplex*, doublecomplex*, doublecomplex*);
void pow_zi(doublecomplex *p, doublecomplex *a, integer *b) /* p = a**b */
-#endif
{
integer n;
unsigned long u;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/pow_zz.c egcc-CVS20020524/libf2c/libF77/pow_zz.c
--- orig/egcc-CVS20020524/libf2c/libF77/pow_zz.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/pow_zz.c 2002-05-24 20:25:32.355662824 -0400
@@ -1,14 +1,9 @@
#include "f2c.h"
-#ifdef KR_headers
-double log(), exp(), cos(), sin(), atan2(), f__cabs();
-VOID pow_zz(r,a,b) doublecomplex *r, *a, *b;
-#else
#undef abs
#include <math.h>
extern double f__cabs(double,double);
void pow_zz(doublecomplex *r, doublecomplex *a, doublecomplex *b)
-#endif
{
double logr, logi, x, y;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/qbitbits.c egcc-CVS20020524/libf2c/libF77/qbitbits.c
--- orig/egcc-CVS20020524/libf2c/libF77/qbitbits.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/qbitbits.c 2002-05-24 20:25:56.373242582 -0400
@@ -9,11 +9,7 @@
#endif
integer
-#ifdef KR_headers
-qbit_bits(a, b, len) longint a; integer b, len;
-#else
qbit_bits(longint a, integer b, integer len)
-#endif
{
/* Assume 2's complement arithmetic */
@@ -27,11 +23,7 @@ qbit_bits(longint a, integer b, integer
}
longint
-#ifdef KR_headers
-qbit_cshift(a, b, len) longint a; integer b, len;
-#else
qbit_cshift(longint a, integer b, integer len)
-#endif
{
ulongint x, y, z;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/qbitshft.c egcc-CVS20020524/libf2c/libF77/qbitshft.c
--- orig/egcc-CVS20020524/libf2c/libF77/qbitshft.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/qbitshft.c 2002-05-24 20:26:03.152542456 -0400
@@ -1,11 +1,7 @@
#include "f2c.h"
longint
-#ifdef KR_headers
-qbit_shift(a, b) longint a; integer b;
-#else
qbit_shift(longint a, integer b)
-#endif
{
return b >= 0 ? a << b : (longint)((ulongint)a >> -b);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_abs.c egcc-CVS20020524/libf2c/libF77/r_abs.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_abs.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_abs.c 2002-05-24 20:26:22.280669783 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-double r_abs(x) real *x;
-#else
double r_abs(real *x)
-#endif
{
if(*x >= 0)
return(*x);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_acos.c egcc-CVS20020524/libf2c/libF77/r_acos.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_acos.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_acos.c 2002-05-24 20:26:29.289964005 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double acos();
-double r_acos(x) real *x;
-#else
#undef abs
#include <math.h>
double r_acos(real *x)
-#endif
{
return( acos(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_asin.c egcc-CVS20020524/libf2c/libF77/r_asin.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_asin.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_asin.c 2002-05-24 20:26:37.229152209 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double asin();
-double r_asin(x) real *x;
-#else
#undef abs
#include <math.h>
double r_asin(real *x)
-#endif
{
return( asin(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_atan.c egcc-CVS20020524/libf2c/libF77/r_atan.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_atan.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_atan.c 2002-05-24 20:26:47.488037026 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double atan();
-double r_atan(x) real *x;
-#else
#undef abs
#include <math.h>
double r_atan(real *x)
-#endif
{
return( atan(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_atn2.c egcc-CVS20020524/libf2c/libF77/r_atn2.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_atn2.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_atn2.c 2002-05-24 20:26:55.247331790 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double atan2();
-double r_atn2(x,y) real *x, *y;
-#else
#undef abs
#include <math.h>
double r_atn2(real *x, real *y)
-#endif
{
return( atan2(*x,*y) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_cnjg.c egcc-CVS20020524/libf2c/libF77/r_cnjg.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_cnjg.c 1999-05-03 04:35:14.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_cnjg.c 2002-05-24 20:27:09.915813874 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-VOID r_cnjg(r, z) complex *r, *z;
-#else
VOID r_cnjg(complex *r, complex *z)
-#endif
{
real zi = z->i;
r->r = z->r;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_cos.c egcc-CVS20020524/libf2c/libF77/r_cos.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_cos.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_cos.c 2002-05-24 20:27:18.724897644 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double cos();
-double r_cos(x) real *x;
-#else
#undef abs
#include <math.h>
double r_cos(real *x)
-#endif
{
return( cos(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_cosh.c egcc-CVS20020524/libf2c/libF77/r_cosh.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_cosh.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_cosh.c 2002-05-24 20:27:27.583995995 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double cosh();
-double r_cosh(x) real *x;
-#else
#undef abs
#include <math.h>
double r_cosh(real *x)
-#endif
{
return( cosh(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_dim.c egcc-CVS20020524/libf2c/libF77/r_dim.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_dim.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_dim.c 2002-05-24 20:27:34.053391588 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-double r_dim(a,b) real *a, *b;
-#else
double r_dim(real *a, real *b)
-#endif
{
return( *a > *b ? *a - *b : 0);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_exp.c egcc-CVS20020524/libf2c/libF77/r_exp.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_exp.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_exp.c 2002-05-24 20:27:42.992600239 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double exp();
-double r_exp(x) real *x;
-#else
#undef abs
#include <math.h>
double r_exp(real *x)
-#endif
{
return( exp(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_imag.c egcc-CVS20020524/libf2c/libF77/r_imag.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_imag.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_imag.c 2002-05-24 20:27:52.301877792 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-double r_imag(z) complex *z;
-#else
double r_imag(complex *z)
-#endif
{
return(z->i);
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_int.c egcc-CVS20020524/libf2c/libF77/r_int.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_int.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_int.c 2002-05-24 20:27:58.041426271 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double floor();
-double r_int(x) real *x;
-#else
#undef abs
#include <math.h>
double r_int(real *x)
-#endif
{
return( (*x>0) ? floor(*x) : -floor(- *x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_lg10.c egcc-CVS20020524/libf2c/libF77/r_lg10.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_lg10.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_lg10.c 2002-05-24 20:28:08.950488372 -0400
@@ -2,14 +2,9 @@
#define log10e 0.43429448190325182765
-#ifdef KR_headers
-double log();
-double r_lg10(x) real *x;
-#else
#undef abs
#include <math.h>
double r_lg10(real *x)
-#endif
{
return( log10e * log(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_log.c egcc-CVS20020524/libf2c/libF77/r_log.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_log.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_log.c 2002-05-24 20:28:15.669794112 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double log();
-double r_log(x) real *x;
-#else
#undef abs
#include <math.h>
double r_log(real *x)
-#endif
{
return( log(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_mod.c egcc-CVS20020524/libf2c/libF77/r_mod.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_mod.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_mod.c 2002-05-24 20:28:31.838757041 -0400
@@ -1,13 +1,5 @@
#include "f2c.h"
-#ifdef KR_headers
-#ifdef IEEE_drem
-double drem();
-#else
-double floor();
-#endif
-double r_mod(x,y) real *x, *y;
-#else
#ifdef IEEE_drem
double drem(double, double);
#else
@@ -15,7 +7,6 @@ double drem(double, double);
#include <math.h>
#endif
double r_mod(real *x, real *y)
-#endif
{
#ifdef IEEE_drem
double xa, ya, z;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_nint.c egcc-CVS20020524/libf2c/libF77/r_nint.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_nint.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_nint.c 2002-05-24 20:29:26.834959418 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double floor();
-double r_nint(x) real *x;
-#else
#undef abs
#include <math.h>
double r_nint(real *x)
-#endif
{
return( (*x)>=0 ?
floor(*x + .5) : -floor(.5 - *x) );
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_sign.c egcc-CVS20020524/libf2c/libF77/r_sign.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_sign.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_sign.c 2002-05-24 20:28:44.888045817 -0400
@@ -1,10 +1,6 @@
#include "f2c.h"
-#ifdef KR_headers
-double r_sign(a,b) real *a, *b;
-#else
double r_sign(real *a, real *b)
-#endif
{
double x;
x = (*a >= 0 ? *a : - *a);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_sin.c egcc-CVS20020524/libf2c/libF77/r_sin.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_sin.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_sin.c 2002-05-24 20:28:51.027695173 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double sin();
-double r_sin(x) real *x;
-#else
#undef abs
#include <math.h>
double r_sin(real *x)
-#endif
{
return( sin(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_sinh.c egcc-CVS20020524/libf2c/libF77/r_sinh.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_sinh.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_sinh.c 2002-05-24 20:28:58.797243719 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double sinh();
-double r_sinh(x) real *x;
-#else
#undef abs
#include <math.h>
double r_sinh(real *x)
-#endif
{
return( sinh(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_sqrt.c egcc-CVS20020524/libf2c/libF77/r_sqrt.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_sqrt.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_sqrt.c 2002-05-24 20:29:08.526656860 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double sqrt();
-double r_sqrt(x) real *x;
-#else
#undef abs
#include <math.h>
double r_sqrt(real *x)
-#endif
{
return( sqrt(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_tan.c egcc-CVS20020524/libf2c/libF77/r_tan.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_tan.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_tan.c 2002-05-24 20:29:38.233933048 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double tan();
-double r_tan(x) real *x;
-#else
#undef abs
#include <math.h>
double r_tan(real *x)
-#endif
{
return( tan(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/r_tanh.c egcc-CVS20020524/libf2c/libF77/r_tanh.c
--- orig/egcc-CVS20020524/libf2c/libF77/r_tanh.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/r_tanh.c 2002-05-24 20:29:44.743311479 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double tanh();
-double r_tanh(x) real *x;
-#else
#undef abs
#include <math.h>
double r_tanh(real *x)
-#endif
{
return( tanh(*x) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/s_cat.c egcc-CVS20020524/libf2c/libF77/s_cat.c
--- orig/egcc-CVS20020524/libf2c/libF77/s_cat.c 2000-12-09 10:34:53.000000000 -0500
+++ egcc-CVS20020524/libf2c/libF77/s_cat.c 2002-05-24 20:33:12.483291585 -0400
@@ -7,25 +7,15 @@
#ifndef NO_OVERWRITE
#include <stdio.h>
#undef abs
-#ifdef KR_headers
- extern char *F77_aloc();
- extern void free();
- extern void G77_exit_0 ();
-#else
#undef min
#undef max
#include <stdlib.h>
extern char *F77_aloc(ftnlen, char*);
-#endif
#include <string.h>
#endif /* NO_OVERWRITE */
VOID
-#ifdef KR_headers
-s_cat(lp, rpp, rnp, np, ll) char *lp, *rpp[]; ftnint rnp[], *np; ftnlen ll;
-#else
s_cat(char *lp, char *rpp[], ftnint rnp[], ftnint *np, ftnlen ll)
-#endif
{
ftnlen i, nc;
char *rp;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/s_cmp.c egcc-CVS20020524/libf2c/libF77/s_cmp.c
--- orig/egcc-CVS20020524/libf2c/libF77/s_cmp.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/s_cmp.c 2002-05-24 20:33:19.302708156 -0400
@@ -2,11 +2,7 @@
/* compare two strings */
-#ifdef KR_headers
-integer s_cmp(a0, b0, la, lb) char *a0, *b0; ftnlen la, lb;
-#else
integer s_cmp(char *a0, char *b0, ftnlen la, ftnlen lb)
-#endif
{
register unsigned char *a, *aend, *b, *bend;
a = (unsigned char *)a0;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/s_copy.c egcc-CVS20020524/libf2c/libF77/s_copy.c
--- orig/egcc-CVS20020524/libf2c/libF77/s_copy.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/s_copy.c 2002-05-24 20:33:27.121909282 -0400
@@ -8,11 +8,7 @@
/* assign strings: a = b */
-#ifdef KR_headers
-VOID s_copy(a, b, la, lb) register char *a, *b; ftnlen la, lb;
-#else
void s_copy(register char *a, register char *b, ftnlen la, ftnlen lb)
-#endif
{
register char *aend, *bend;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/s_paus.c egcc-CVS20020524/libf2c/libF77/s_paus.c
--- orig/egcc-CVS20020524/libf2c/libF77/s_paus.c 1998-05-19 06:50:59.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/s_paus.c 2002-05-24 20:34:08.828105958 -0400
@@ -3,10 +3,6 @@
#define PAUSESIG 15
#include "signal1.h"
-#ifdef KR_headers
-#define Void /* void */
-#define Int /* int */
-#else
#define Void void
#define Int int
#undef abs
@@ -17,7 +13,6 @@
extern "C" {
#endif
extern int getpid(void), isatty(int), pause(void);
-#endif
extern VOID f_exit(Void);
@@ -28,11 +23,7 @@ waitpause(Sigarg)
}
static VOID
-#ifdef KR_headers
-s_1paus(fin) FILE *fin;
-#else
s_1paus(FILE *fin)
-#endif
{
fprintf(stderr,
"To resume execution, type go. Other input will terminate the job.\n");
@@ -47,11 +38,7 @@ s_1paus(FILE *fin)
}
int
-#ifdef KR_headers
-s_paus(s, n) char *s; ftnlen n;
-#else
s_paus(char *s, ftnlen n)
-#endif
{
fprintf(stderr, "PAUSE ");
if(n > 0)
diff -rup orig/egcc-CVS20020524/libf2c/libF77/s_rnge.c egcc-CVS20020524/libf2c/libF77/s_rnge.c
--- orig/egcc-CVS20020524/libf2c/libF77/s_rnge.c 2000-03-12 14:20:47.000000000 -0500
+++ egcc-CVS20020524/libf2c/libF77/s_rnge.c 2002-05-24 20:34:16.137393350 -0400
@@ -3,13 +3,8 @@
/* called when a subscript is out of range */
-#ifdef KR_headers
-extern VOID sig_die();
-integer s_rnge(varn, offset, procn, line) char *varn, *procn; ftnint offset, line;
-#else
extern VOID sig_die(char*,int);
integer s_rnge(char *varn, ftnint offset, char *procn, ftnint line)
-#endif
{
register int i;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/s_stop.c egcc-CVS20020524/libf2c/libF77/s_stop.c
--- orig/egcc-CVS20020524/libf2c/libF77/s_stop.c 1999-05-10 10:40:56.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/s_stop.c 2002-05-24 20:34:30.525877391 -0400
@@ -1,10 +1,6 @@
#include <stdio.h>
#include "f2c.h"
-#ifdef KR_headers
-extern void f_exit();
-VOID s_stop(s, n) char *s; ftnlen n;
-#else
#undef abs
#undef min
#undef max
@@ -15,7 +11,6 @@ extern "C" {
void f_exit(void);
int s_stop(char *s, ftnlen n)
-#endif
{
int i;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/setarg.c egcc-CVS20020524/libf2c/libF77/setarg.c
--- orig/egcc-CVS20020524/libf2c/libF77/setarg.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/setarg.c 2002-05-24 22:21:09.477147690 -0400
@@ -1,10 +1,8 @@
/* Set up the global argc/argv info for use by getarg_, iargc_, and
g77's inlined intrinsic equivalents. */
-#ifndef KR_headers
#undef VOID
#include <stdlib.h>
-#endif
#ifndef VOID
#define VOID void
@@ -18,11 +16,7 @@ char **f__xargv;
#endif
void
-#ifdef KR_headers
-f_setarg(argc, argv) int argc; char **argv;
-#else
f_setarg(int argc, char **argv)
-#endif
{
f__xargc = argc;
f__xargv = argv;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/setsig.c egcc-CVS20020524/libf2c/libF77/setsig.c
--- orig/egcc-CVS20020524/libf2c/libF77/setsig.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/setsig.c 2002-05-24 22:21:40.414742218 -0400
@@ -9,10 +9,8 @@
#endif
#endif
-#ifndef KR_headers
#undef VOID
#include <stdlib.h>
-#endif
#ifndef VOID
#define VOID void
@@ -22,13 +20,8 @@
extern "C" {
#endif
-#ifdef KR_headers
-extern VOID sig_die();
-#define Int /* int */
-#else
extern void sig_die(char*, int);
#define Int int
-#endif
static VOID sigfdie(Sigarg)
{
diff -rup orig/egcc-CVS20020524/libf2c/libF77/sig_die.c egcc-CVS20020524/libf2c/libF77/sig_die.c
--- orig/egcc-CVS20020524/libf2c/libF77/sig_die.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/sig_die.c 2002-05-24 22:22:11.401750401 -0400
@@ -7,9 +7,6 @@
#endif
#endif
-#ifdef KR_headers
-void sig_die(s, kill) register char *s; int kill;
-#else
#include <stdlib.h>
#ifdef __cplusplus
extern "C" {
@@ -17,7 +14,6 @@ extern "C" {
extern void f_exit(void);
void sig_die(register char *s, int kill)
-#endif
{
/* print error message, then clear buffers */
fprintf(stderr, "%s\n", s);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/signal1.h0 egcc-CVS20020524/libf2c/libF77/signal1.h0
--- orig/egcc-CVS20020524/libf2c/libF77/signal1.h0 1999-03-17 03:21:15.000000000 -0500
+++ egcc-CVS20020524/libf2c/libF77/signal1.h0 2002-05-24 22:22:29.129989428 -0400
@@ -11,11 +11,7 @@
#define Sigret_t void
#endif
#ifndef Sigarg_t
-#ifdef KR_headers
-#define Sigarg_t
-#else
#define Sigarg_t int
-#endif
#endif /*Sigarg_t*/
#ifdef USE_SIG_PF /* compile with -DUSE_SIG_PF under IRIX */
diff -rup orig/egcc-CVS20020524/libf2c/libF77/signal_.c egcc-CVS20020524/libf2c/libF77/signal_.c
--- orig/egcc-CVS20020524/libf2c/libF77/signal_.c 1998-05-19 07:01:47.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/signal_.c 2002-05-24 22:22:36.939210115 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
#include "signal1.h"
-#ifdef KR_headers
-void *
-G77_signal_0 (sigp, proc) integer *sigp; sig_pf proc;
-#else
void *
G77_signal_0 (integer *sigp, sig_pf proc)
-#endif
{
int sig;
sig = (int)*sigp;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/system_.c egcc-CVS20020524/libf2c/libF77/system_.c
--- orig/egcc-CVS20020524/libf2c/libF77/system_.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/system_.c 2002-05-24 22:22:48.448041062 -0400
@@ -2,12 +2,6 @@
#include "f2c.h"
-#ifdef KR_headers
-extern char *F77_aloc();
-
- integer
-G77_system_0 (s, n) register char *s; ftnlen n;
-#else
#undef abs
#undef min
#undef max
@@ -16,7 +10,6 @@ extern char *F77_aloc(ftnlen, char*);
integer
G77_system_0 (register char *s, ftnlen n)
-#endif
{
char buff0[256], *buff;
register char *bp, *blast;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/z_abs.c egcc-CVS20020524/libf2c/libF77/z_abs.c
--- orig/egcc-CVS20020524/libf2c/libF77/z_abs.c 1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/z_abs.c 2002-05-24 22:22:56.297353184 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-double f__cabs();
-double z_abs(z) doublecomplex *z;
-#else
double f__cabs(double, double);
double z_abs(doublecomplex *z)
-#endif
{
return( f__cabs( z->r, z->i ) );
}
diff -rup orig/egcc-CVS20020524/libf2c/libF77/z_cos.c egcc-CVS20020524/libf2c/libF77/z_cos.c
--- orig/egcc-CVS20020524/libf2c/libF77/z_cos.c 1999-05-03 04:35:15.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/z_cos.c 2002-05-24 22:23:02.516661225 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double sin(), cos(), sinh(), cosh();
-VOID z_cos(r, z) doublecomplex *r, *z;
-#else
#undef abs
#include "math.h"
void z_cos(doublecomplex *r, doublecomplex *z)
-#endif
{
double zi = z->i, zr = z->r;
r->r = cos(zr) * cosh(zi);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/z_div.c egcc-CVS20020524/libf2c/libF77/z_div.c
--- orig/egcc-CVS20020524/libf2c/libF77/z_div.c 2000-03-12 14:20:47.000000000 -0500
+++ egcc-CVS20020524/libf2c/libF77/z_div.c 2002-05-24 22:23:10.955875386 -0400
@@ -1,12 +1,7 @@
#include "f2c.h"
-#ifdef KR_headers
-extern VOID sig_die();
-VOID z_div(c, a, b) doublecomplex *a, *b, *c;
-#else
extern void sig_die(char*, int);
void z_div(doublecomplex *c, doublecomplex *a, doublecomplex *b)
-#endif
{
double ratio, den;
double abr, abi, cr;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/z_exp.c egcc-CVS20020524/libf2c/libF77/z_exp.c
--- orig/egcc-CVS20020524/libf2c/libF77/z_exp.c 1999-05-03 04:35:16.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/z_exp.c 2002-05-24 22:23:18.785087184 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double exp(), cos(), sin();
-VOID z_exp(r, z) doublecomplex *r, *z;
-#else
#undef abs
#include "math.h"
void z_exp(doublecomplex *r, doublecomplex *z)
-#endif
{
double expx, zi = z->i;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/z_log.c egcc-CVS20020524/libf2c/libF77/z_log.c
--- orig/egcc-CVS20020524/libf2c/libF77/z_log.c 2000-12-09 10:34:53.000000000 -0500
+++ egcc-CVS20020524/libf2c/libF77/z_log.c 2002-05-24 22:23:27.644204708 -0400
@@ -1,14 +1,9 @@
#include "f2c.h"
-#ifdef KR_headers
-double log(), f__cabs(), atan2();
-VOID z_log(r, z) doublecomplex *r, *z;
-#else
#undef abs
#include "math.h"
extern double f__cabs(double, double);
void z_log(doublecomplex *r, doublecomplex *z)
-#endif
{
double s, s0, t, t2, u, v;
double zi = z->i, zr = z->r;
diff -rup orig/egcc-CVS20020524/libf2c/libF77/z_sin.c egcc-CVS20020524/libf2c/libF77/z_sin.c
--- orig/egcc-CVS20020524/libf2c/libF77/z_sin.c 1999-05-03 04:35:18.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/z_sin.c 2002-05-24 22:23:35.653416250 -0400
@@ -1,13 +1,8 @@
#include "f2c.h"
-#ifdef KR_headers
-double sin(), cos(), sinh(), cosh();
-VOID z_sin(r, z) doublecomplex *r, *z;
-#else
#undef abs
#include "math.h"
void z_sin(doublecomplex *r, doublecomplex *z)
-#endif
{
double zi = z->i, zr = z->r;
r->r = sin(zr) * cosh(zi);
diff -rup orig/egcc-CVS20020524/libf2c/libF77/z_sqrt.c egcc-CVS20020524/libf2c/libF77/z_sqrt.c
--- orig/egcc-CVS20020524/libf2c/libF77/z_sqrt.c 1999-05-03 04:33:21.000000000 -0400
+++ egcc-CVS20020524/libf2c/libF77/z_sqrt.c 2002-05-24 22:23:42.762723892 -0400
@@ -1,14 +1,9 @@
#include "f2c.h"
-#ifdef KR_headers
-double sqrt(), f__cabs();
-VOID z_sqrt(r, z) doublecomplex *r, *z;
-#else
#undef abs
#include "math.h"
extern double f__cabs(double, double);
void z_sqrt(doublecomplex *r, doublecomplex *z)
-#endif
{
double mag, zi = z->i, zr = z->r;