diff options
Diffstat (limited to 'libf2c/libF77')
126 files changed, 49 insertions, 720 deletions
diff --git a/libf2c/libF77/F77_aloc.c b/libf2c/libF77/F77_aloc.c index e329a1b..f34bfa0 100644 --- a/libf2c/libF77/F77_aloc.c +++ b/libf2c/libF77/F77_aloc.c @@ -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 --git a/libf2c/libF77/abort_.c b/libf2c/libF77/abort_.c index f0c2f8d..ac277f6 100644 --- a/libf2c/libF77/abort_.c +++ b/libf2c/libF77/abort_.c @@ -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 --git a/libf2c/libF77/c_abs.c b/libf2c/libF77/c_abs.c index 041fbd3..c1251e1 100644 --- a/libf2c/libF77/c_abs.c +++ b/libf2c/libF77/c_abs.c @@ -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 --git a/libf2c/libF77/c_cos.c b/libf2c/libF77/c_cos.c index 549953d..eb2acc4 100644 --- a/libf2c/libF77/c_cos.c +++ b/libf2c/libF77/c_cos.c @@ -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 --git a/libf2c/libF77/c_div.c b/libf2c/libF77/c_div.c index 4d153b4..20763a3 100644 --- a/libf2c/libF77/c_div.c +++ b/libf2c/libF77/c_div.c @@ -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 --git a/libf2c/libF77/c_exp.c b/libf2c/libF77/c_exp.c index 52d0d2f..3e281e9 100644 --- a/libf2c/libF77/c_exp.c +++ b/libf2c/libF77/c_exp.c @@ -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 --git a/libf2c/libF77/c_log.c b/libf2c/libF77/c_log.c index 24d1a3c..990b420 100644 --- a/libf2c/libF77/c_log.c +++ b/libf2c/libF77/c_log.c @@ -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 --git a/libf2c/libF77/c_sin.c b/libf2c/libF77/c_sin.c index 93a5766..07ef4d6 100644 --- a/libf2c/libF77/c_sin.c +++ b/libf2c/libF77/c_sin.c @@ -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 --git a/libf2c/libF77/c_sqrt.c b/libf2c/libF77/c_sqrt.c index 8481ee4..3b9a30f 100644 --- a/libf2c/libF77/c_sqrt.c +++ b/libf2c/libF77/c_sqrt.c @@ -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 --git a/libf2c/libF77/cabs.c b/libf2c/libF77/cabs.c index 2fad044..17276ab 100644 --- a/libf2c/libF77/cabs.c +++ b/libf2c/libF77/cabs.c @@ -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 --git a/libf2c/libF77/configure b/libf2c/libF77/configure index 5b6a257..4e198c8 100755 --- a/libf2c/libF77/configure +++ b/libf2c/libF77/configure @@ -28,7 +28,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -143,7 +142,6 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -314,11 +312,6 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -484,16 +477,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -541,7 +530,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:545: checking for $ac_word" >&5 +echo "configure:534: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -571,7 +560,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:575: checking for $ac_word" >&5 +echo "configure:564: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -622,7 +611,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:626: checking for $ac_word" >&5 +echo "configure:615: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -655,7 +644,7 @@ fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:659: checking whether we are using GNU C" >&5 +echo "configure:648: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -664,7 +653,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -683,7 +672,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:687: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:676: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -726,7 +715,7 @@ else # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:730: checking for $ac_word" >&5 +echo "configure:719: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -755,7 +744,7 @@ fi fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:759: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:748: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -785,7 +774,7 @@ fi # Sanity check for the cross-compilation case: echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:789: checking how to run the C preprocessor" >&5 +echo "configure:778: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -800,13 +789,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 804 "configure" +#line 793 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -817,13 +806,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 821 "configure" +#line 810 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -834,13 +823,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 838 "configure" +#line 827 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -866,17 +855,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stdio.h""... $ac_c" 1>&6 -echo "configure:870: checking for stdio.h" >&5 +echo "configure:859: checking for stdio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 875 "configure" +#line 864 "configure" #include "confdefs.h" #include <stdio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -904,12 +893,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:908: checking for ANSI C header files" >&5 +echo "configure:897: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 913 "configure" +#line 902 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -917,7 +906,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -934,7 +923,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 938 "configure" +#line 927 "configure" #include "confdefs.h" #include <string.h> EOF @@ -952,7 +941,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 956 "configure" +#line 945 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -973,7 +962,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 977 "configure" +#line 966 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -984,7 +973,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1007,14 +996,13 @@ EOF fi - echo $ac_n "checking for posix""... $ac_c" 1>&6 -echo "configure:1013: checking for posix" >&5 +echo "configure:1001: checking for posix" >&5 if eval "test \"`echo '$''{'g77_cv_header_posix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1018 "configure" +#line 1006 "configure" #include "confdefs.h" #include <sys/types.h> #include <unistd.h> @@ -1040,12 +1028,12 @@ echo "$ac_t""$g77_cv_header_posix" 1>&6 # We can rely on the GNU library being posix-ish. I guess checking the # header isn't actually like checking the functions, though... echo $ac_n "checking for GNU library""... $ac_c" 1>&6 -echo "configure:1044: checking for GNU library" >&5 +echo "configure:1032: checking for GNU library" >&5 if eval "test \"`echo '$''{'g77_cv_lib_gnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1049 "configure" +#line 1037 "configure" #include "confdefs.h" #include <stdio.h> #ifdef __GNU_LIBRARY__ @@ -1068,12 +1056,12 @@ fi echo "$ac_t""$g77_cv_lib_gnu" 1>&6 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1072: checking return type of signal handlers" >&5 +echo "configure:1060: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1077 "configure" +#line 1065 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -1090,7 +1078,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1111,12 +1099,12 @@ EOF # we'll get atexit by default if test $ac_cv_header_stdc != yes; then echo $ac_n "checking for atexit""... $ac_c" 1>&6 -echo "configure:1115: checking for atexit" >&5 +echo "configure:1103: checking for atexit" >&5 if eval "test \"`echo '$''{'ac_cv_func_atexit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1120 "configure" +#line 1108 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char atexit(); below. */ @@ -1139,7 +1127,7 @@ atexit(); ; return 0; } EOF -if { (eval echo configure:1143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_atexit=yes" else @@ -1164,12 +1152,12 @@ else EOF echo $ac_n "checking for onexit""... $ac_c" 1>&6 -echo "configure:1168: checking for onexit" >&5 +echo "configure:1156: checking for onexit" >&5 if eval "test \"`echo '$''{'ac_cv_func_onexit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1173 "configure" +#line 1161 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char onexit(); below. */ @@ -1192,7 +1180,7 @@ onexit(); ; return 0; } EOF -if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_onexit=yes" else @@ -1210,12 +1198,12 @@ if eval "test \"`echo '$ac_cv_func_'onexit`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for on_exit""... $ac_c" 1>&6 -echo "configure:1214: checking for on_exit" >&5 +echo "configure:1202: checking for on_exit" >&5 if eval "test \"`echo '$''{'ac_cv_func_on_exit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1219 "configure" +#line 1207 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char on_exit(); below. */ @@ -1238,7 +1226,7 @@ on_exit(); ; return 0; } EOF -if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_on_exit=yes" else @@ -1268,7 +1256,7 @@ else true fi echo $ac_n "checking for drem in -lm""... $ac_c" 1>&6 -echo "configure:1272: checking for drem in -lm" >&5 +echo "configure:1260: checking for drem in -lm" >&5 ac_lib_var=`echo m'_'drem | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1276,7 +1264,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 1280 "configure" +#line 1268 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1287,7 +1275,7 @@ int main() { drem() ; return 0; } EOF -if { (eval echo configure:1291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/libf2c/libF77/configure.in b/libf2c/libF77/configure.in index ae34d36..838ce96 100644 --- a/libf2c/libF77/configure.in +++ b/libf2c/libF77/configure.in @@ -56,17 +56,6 @@ the G77 runtime system. If necessary, install gcc now with \`LANGUAGES=c', 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 --git a/libf2c/libF77/d_abs.c b/libf2c/libF77/d_abs.c index cb157e0..2927a5e 100644 --- a/libf2c/libF77/d_abs.c +++ b/libf2c/libF77/d_abs.c @@ -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 --git a/libf2c/libF77/d_acos.c b/libf2c/libF77/d_acos.c index 33da536..a87ff30 100644 --- a/libf2c/libF77/d_acos.c +++ b/libf2c/libF77/d_acos.c @@ -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 --git a/libf2c/libF77/d_asin.c b/libf2c/libF77/d_asin.c index 79b33ca..ea2815a 100644 --- a/libf2c/libF77/d_asin.c +++ b/libf2c/libF77/d_asin.c @@ -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 --git a/libf2c/libF77/d_atan.c b/libf2c/libF77/d_atan.c index caea4a4..d1624fd 100644 --- a/libf2c/libF77/d_atan.c +++ b/libf2c/libF77/d_atan.c @@ -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 --git a/libf2c/libF77/d_atn2.c b/libf2c/libF77/d_atn2.c index 6748a55..9a6ff8c 100644 --- a/libf2c/libF77/d_atn2.c +++ b/libf2c/libF77/d_atn2.c @@ -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 --git a/libf2c/libF77/d_cnjg.c b/libf2c/libF77/d_cnjg.c index c1970a5..b802778 100644 --- a/libf2c/libF77/d_cnjg.c +++ b/libf2c/libF77/d_cnjg.c @@ -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 --git a/libf2c/libF77/d_cos.c b/libf2c/libF77/d_cos.c index fa4d6ca..83f9198 100644 --- a/libf2c/libF77/d_cos.c +++ b/libf2c/libF77/d_cos.c @@ -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 --git a/libf2c/libF77/d_cosh.c b/libf2c/libF77/d_cosh.c index edc0ebc..c1bffcb 100644 --- a/libf2c/libF77/d_cosh.c +++ b/libf2c/libF77/d_cosh.c @@ -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 --git a/libf2c/libF77/d_dim.c b/libf2c/libF77/d_dim.c index 1d0ecb7..a52ba76 100644 --- a/libf2c/libF77/d_dim.c +++ b/libf2c/libF77/d_dim.c @@ -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 --git a/libf2c/libF77/d_exp.c b/libf2c/libF77/d_exp.c index be12fd7..b4afe87 100644 --- a/libf2c/libF77/d_exp.c +++ b/libf2c/libF77/d_exp.c @@ -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 --git a/libf2c/libF77/d_imag.c b/libf2c/libF77/d_imag.c index 793a3f9..a53d00c 100644 --- a/libf2c/libF77/d_imag.c +++ b/libf2c/libF77/d_imag.c @@ -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 --git a/libf2c/libF77/d_int.c b/libf2c/libF77/d_int.c index beff1e7..dca077c 100644 --- a/libf2c/libF77/d_int.c +++ b/libf2c/libF77/d_int.c @@ -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 --git a/libf2c/libF77/d_lg10.c b/libf2c/libF77/d_lg10.c index c0892bd..32824b8 100644 --- a/libf2c/libF77/d_lg10.c +++ b/libf2c/libF77/d_lg10.c @@ -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 --git a/libf2c/libF77/d_log.c b/libf2c/libF77/d_log.c index 592015b..50bbefd 100644 --- a/libf2c/libF77/d_log.c +++ b/libf2c/libF77/d_log.c @@ -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 --git a/libf2c/libF77/d_mod.c b/libf2c/libF77/d_mod.c index 23f1929..bbc24ad 100644 --- a/libf2c/libF77/d_mod.c +++ b/libf2c/libF77/d_mod.c @@ -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 --git a/libf2c/libF77/d_nint.c b/libf2c/libF77/d_nint.c index 064beff..b74a15f 100644 --- a/libf2c/libF77/d_nint.c +++ b/libf2c/libF77/d_nint.c @@ -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 --git a/libf2c/libF77/d_prod.c b/libf2c/libF77/d_prod.c index 3d4cef7..b39580f 100644 --- a/libf2c/libF77/d_prod.c +++ b/libf2c/libF77/d_prod.c @@ -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 --git a/libf2c/libF77/d_sign.c b/libf2c/libF77/d_sign.c index 514ff0b..c77d843 100644 --- a/libf2c/libF77/d_sign.c +++ b/libf2c/libF77/d_sign.c @@ -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 --git a/libf2c/libF77/d_sin.c b/libf2c/libF77/d_sin.c index fdd699e..ed51ebd 100644 --- a/libf2c/libF77/d_sin.c +++ b/libf2c/libF77/d_sin.c @@ -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 --git a/libf2c/libF77/d_sinh.c b/libf2c/libF77/d_sinh.c index 77f3690..b691dc0 100644 --- a/libf2c/libF77/d_sinh.c +++ b/libf2c/libF77/d_sinh.c @@ -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 --git a/libf2c/libF77/d_sqrt.c b/libf2c/libF77/d_sqrt.c index b5cf83b..760a524 100644 --- a/libf2c/libF77/d_sqrt.c +++ b/libf2c/libF77/d_sqrt.c @@ -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 --git a/libf2c/libF77/d_tan.c b/libf2c/libF77/d_tan.c index af94a05..a93e58b 100644 --- a/libf2c/libF77/d_tan.c +++ b/libf2c/libF77/d_tan.c @@ -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 --git a/libf2c/libF77/d_tanh.c b/libf2c/libF77/d_tanh.c index 92a02d4..06c44d0 100644 --- a/libf2c/libF77/d_tanh.c +++ b/libf2c/libF77/d_tanh.c @@ -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 --git a/libf2c/libF77/derf_.c b/libf2c/libF77/derf_.c index fba6b6b..cc41913 100644 --- a/libf2c/libF77/derf_.c +++ b/libf2c/libF77/derf_.c @@ -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 --git a/libf2c/libF77/derfc_.c b/libf2c/libF77/derfc_.c index ae1ac74..0be1159 100644 --- a/libf2c/libF77/derfc_.c +++ b/libf2c/libF77/derfc_.c @@ -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 --git a/libf2c/libF77/dtime_.c b/libf2c/libF77/dtime_.c index e2c3a03..9d5abf6 100644 --- a/libf2c/libF77/dtime_.c +++ b/libf2c/libF77/dtime_.c @@ -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 --git a/libf2c/libF77/ef1asc_.c b/libf2c/libF77/ef1asc_.c index 8588584..2e12423 100644 --- a/libf2c/libF77/ef1asc_.c +++ b/libf2c/libF77/ef1asc_.c @@ -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 --git a/libf2c/libF77/ef1cmc_.c b/libf2c/libF77/ef1cmc_.c index f471172..79eabdf 100644 --- a/libf2c/libF77/ef1cmc_.c +++ b/libf2c/libF77/ef1cmc_.c @@ -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 --git a/libf2c/libF77/erf_.c b/libf2c/libF77/erf_.c index 1ba4350..e8a90ed 100644 --- a/libf2c/libF77/erf_.c +++ b/libf2c/libF77/erf_.c @@ -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 --git a/libf2c/libF77/erfc_.c b/libf2c/libF77/erfc_.c index f44b1d4..5f72479 100644 --- a/libf2c/libF77/erfc_.c +++ b/libf2c/libF77/erfc_.c @@ -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 --git a/libf2c/libF77/etime_.c b/libf2c/libF77/etime_.c index 0c3209d..48a8f6b 100644 --- a/libf2c/libF77/etime_.c +++ b/libf2c/libF77/etime_.c @@ -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 --git a/libf2c/libF77/exit_.c b/libf2c/libF77/exit_.c index 4c0582a..7c361db 100644 --- a/libf2c/libF77/exit_.c +++ b/libf2c/libF77/exit_.c @@ -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 --git a/libf2c/libF77/getarg_.c b/libf2c/libF77/getarg_.c index 5cf3ffb..c873596 100644 --- a/libf2c/libF77/getarg_.c +++ b/libf2c/libF77/getarg_.c @@ -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 --git a/libf2c/libF77/getenv_.c b/libf2c/libF77/getenv_.c index 4d0b7cf..a1654ef 100644 --- a/libf2c/libF77/getenv_.c +++ b/libf2c/libF77/getenv_.c @@ -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 --git a/libf2c/libF77/h_abs.c b/libf2c/libF77/h_abs.c index 73b8215..e5f4d6b3 100644 --- a/libf2c/libF77/h_abs.c +++ b/libf2c/libF77/h_abs.c @@ -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 --git a/libf2c/libF77/h_dim.c b/libf2c/libF77/h_dim.c index ceff660..04cf55d 100644 --- a/libf2c/libF77/h_dim.c +++ b/libf2c/libF77/h_dim.c @@ -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 --git a/libf2c/libF77/h_dnnt.c b/libf2c/libF77/h_dnnt.c index 005ac6f..651d05c 100644 --- a/libf2c/libF77/h_dnnt.c +++ b/libf2c/libF77/h_dnnt.c @@ -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 --git a/libf2c/libF77/h_indx.c b/libf2c/libF77/h_indx.c index a211cc7..a78c873 100644 --- a/libf2c/libF77/h_indx.c +++ b/libf2c/libF77/h_indx.c @@ -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 --git a/libf2c/libF77/h_len.c b/libf2c/libF77/h_len.c index 00a2151..8c63116 100644 --- a/libf2c/libF77/h_len.c +++ b/libf2c/libF77/h_len.c @@ -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 --git a/libf2c/libF77/h_mod.c b/libf2c/libF77/h_mod.c index 43431c1..998ada7 100644 --- a/libf2c/libF77/h_mod.c +++ b/libf2c/libF77/h_mod.c @@ -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 --git a/libf2c/libF77/h_nint.c b/libf2c/libF77/h_nint.c index 6b8dc29..bdfee64 100644 --- a/libf2c/libF77/h_nint.c +++ b/libf2c/libF77/h_nint.c @@ -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 --git a/libf2c/libF77/h_sign.c b/libf2c/libF77/h_sign.c index 7b06c15..7efc7ca 100644 --- a/libf2c/libF77/h_sign.c +++ b/libf2c/libF77/h_sign.c @@ -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 --git a/libf2c/libF77/hl_ge.c b/libf2c/libF77/hl_ge.c index 4c29527..2415216 100644 --- a/libf2c/libF77/hl_ge.c +++ b/libf2c/libF77/hl_ge.c @@ -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 --git a/libf2c/libF77/hl_gt.c b/libf2c/libF77/hl_gt.c index c4f345a..bf5c420 100644 --- a/libf2c/libF77/hl_gt.c +++ b/libf2c/libF77/hl_gt.c @@ -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 --git a/libf2c/libF77/hl_le.c b/libf2c/libF77/hl_le.c index a9cce59..cb6fe05 100644 --- a/libf2c/libF77/hl_le.c +++ b/libf2c/libF77/hl_le.c @@ -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 --git a/libf2c/libF77/hl_lt.c b/libf2c/libF77/hl_lt.c index 162d919..f774c71 100644 --- a/libf2c/libF77/hl_lt.c +++ b/libf2c/libF77/hl_lt.c @@ -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 --git a/libf2c/libF77/i_abs.c b/libf2c/libF77/i_abs.c index be21295..2f96f5c 100644 --- a/libf2c/libF77/i_abs.c +++ b/libf2c/libF77/i_abs.c @@ -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 --git a/libf2c/libF77/i_dim.c b/libf2c/libF77/i_dim.c index 6e1b170..68e8a3d 100644 --- a/libf2c/libF77/i_dim.c +++ b/libf2c/libF77/i_dim.c @@ -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 --git a/libf2c/libF77/i_dnnt.c b/libf2c/libF77/i_dnnt.c index 4ede56a..ed4fdff 100644 --- a/libf2c/libF77/i_dnnt.c +++ b/libf2c/libF77/i_dnnt.c @@ -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 --git a/libf2c/libF77/i_indx.c b/libf2c/libF77/i_indx.c index 96e7bc5..92c44aa 100644 --- a/libf2c/libF77/i_indx.c +++ b/libf2c/libF77/i_indx.c @@ -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 --git a/libf2c/libF77/i_len.c b/libf2c/libF77/i_len.c index 4020fee..0e9cfb7 100644 --- a/libf2c/libF77/i_len.c +++ b/libf2c/libF77/i_len.c @@ -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 --git a/libf2c/libF77/i_mod.c b/libf2c/libF77/i_mod.c index 6937c42..2e574f7 100644 --- a/libf2c/libF77/i_mod.c +++ b/libf2c/libF77/i_mod.c @@ -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 --git a/libf2c/libF77/i_nint.c b/libf2c/libF77/i_nint.c index 411ce32..2698d5f 100644 --- a/libf2c/libF77/i_nint.c +++ b/libf2c/libF77/i_nint.c @@ -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 --git a/libf2c/libF77/i_sign.c b/libf2c/libF77/i_sign.c index 94009b8..1db4729 100644 --- a/libf2c/libF77/i_sign.c +++ b/libf2c/libF77/i_sign.c @@ -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 --git a/libf2c/libF77/iargc_.c b/libf2c/libF77/iargc_.c index 1e04c77..a57c257 100644 --- a/libf2c/libF77/iargc_.c +++ b/libf2c/libF77/iargc_.c @@ -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 --git a/libf2c/libF77/l_ge.c b/libf2c/libF77/l_ge.c index 86b4a1f..ffa2faa 100644 --- a/libf2c/libF77/l_ge.c +++ b/libf2c/libF77/l_ge.c @@ -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 --git a/libf2c/libF77/l_gt.c b/libf2c/libF77/l_gt.c index c4b52f5..e0d3144 100644 --- a/libf2c/libF77/l_gt.c +++ b/libf2c/libF77/l_gt.c @@ -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 --git a/libf2c/libF77/l_le.c b/libf2c/libF77/l_le.c index f2740a2..d3e9de8 100644 --- a/libf2c/libF77/l_le.c +++ b/libf2c/libF77/l_le.c @@ -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 --git a/libf2c/libF77/l_lt.c b/libf2c/libF77/l_lt.c index c48dc94..df28ec0 100644 --- a/libf2c/libF77/l_lt.c +++ b/libf2c/libF77/l_lt.c @@ -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 --git a/libf2c/libF77/lbitbits.c b/libf2c/libF77/lbitbits.c index 75e9f9c..4536dc4 100644 --- a/libf2c/libF77/lbitbits.c +++ b/libf2c/libF77/lbitbits.c @@ -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 len) } 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 --git a/libf2c/libF77/lbitshft.c b/libf2c/libF77/lbitshft.c index 81b0fdb..daa1e76 100644 --- a/libf2c/libF77/lbitshft.c +++ b/libf2c/libF77/lbitshft.c @@ -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 --git a/libf2c/libF77/main.c b/libf2c/libF77/main.c index 17bf449..9f41947 100644 --- a/libf2c/libF77/main.c +++ b/libf2c/libF77/main.c @@ -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 --git a/libf2c/libF77/pow_ci.c b/libf2c/libF77/pow_ci.c index 37e2ce0..98bb84f 100644 --- a/libf2c/libF77/pow_ci.c +++ b/libf2c/libF77/pow_ci.c @@ -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 --git a/libf2c/libF77/pow_dd.c b/libf2c/libF77/pow_dd.c index d0dd0ff..7c421fe 100644 --- a/libf2c/libF77/pow_dd.c +++ b/libf2c/libF77/pow_dd.c @@ -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 --git a/libf2c/libF77/pow_di.c b/libf2c/libF77/pow_di.c index affed62..d396ed0 100644 --- a/libf2c/libF77/pow_di.c +++ b/libf2c/libF77/pow_di.c @@ -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 --git a/libf2c/libF77/pow_hh.c b/libf2c/libF77/pow_hh.c index 24a0197..d734720 100644 --- a/libf2c/libF77/pow_hh.c +++ b/libf2c/libF77/pow_hh.c @@ -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 --git a/libf2c/libF77/pow_ii.c b/libf2c/libF77/pow_ii.c index 84d1c7e..a895b23 100644 --- a/libf2c/libF77/pow_ii.c +++ b/libf2c/libF77/pow_ii.c @@ -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 --git a/libf2c/libF77/pow_qq.c b/libf2c/libF77/pow_qq.c index 3bc80e0..df01f14 100644 --- a/libf2c/libF77/pow_qq.c +++ b/libf2c/libF77/pow_qq.c @@ -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 --git a/libf2c/libF77/pow_ri.c b/libf2c/libF77/pow_ri.c index 6e5816b..c15347a 100644 --- a/libf2c/libF77/pow_ri.c +++ b/libf2c/libF77/pow_ri.c @@ -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 --git a/libf2c/libF77/pow_zi.c b/libf2c/libF77/pow_zi.c index abb3cb2..3b52060 100644 --- a/libf2c/libF77/pow_zi.c +++ b/libf2c/libF77/pow_zi.c @@ -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 --git a/libf2c/libF77/pow_zz.c b/libf2c/libF77/pow_zz.c index 20faf29..5fc8c45 100644 --- a/libf2c/libF77/pow_zz.c +++ b/libf2c/libF77/pow_zz.c @@ -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 --git a/libf2c/libF77/qbitbits.c b/libf2c/libF77/qbitbits.c index ad4ac96..ef87858 100644 --- a/libf2c/libF77/qbitbits.c +++ b/libf2c/libF77/qbitbits.c @@ -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 len) } 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 --git a/libf2c/libF77/qbitshft.c b/libf2c/libF77/qbitshft.c index 87fffb9..03ab5f2 100644 --- a/libf2c/libF77/qbitshft.c +++ b/libf2c/libF77/qbitshft.c @@ -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 --git a/libf2c/libF77/r_abs.c b/libf2c/libF77/r_abs.c index 7b22296..77c2abd 100644 --- a/libf2c/libF77/r_abs.c +++ b/libf2c/libF77/r_abs.c @@ -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 --git a/libf2c/libF77/r_acos.c b/libf2c/libF77/r_acos.c index 330f88a..79d7b6b 100644 --- a/libf2c/libF77/r_acos.c +++ b/libf2c/libF77/r_acos.c @@ -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 --git a/libf2c/libF77/r_asin.c b/libf2c/libF77/r_asin.c index 45ece4b..83722ba 100644 --- a/libf2c/libF77/r_asin.c +++ b/libf2c/libF77/r_asin.c @@ -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 --git a/libf2c/libF77/r_atan.c b/libf2c/libF77/r_atan.c index 36479c9..f8262f2 100644 --- a/libf2c/libF77/r_atan.c +++ b/libf2c/libF77/r_atan.c @@ -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 --git a/libf2c/libF77/r_atn2.c b/libf2c/libF77/r_atn2.c index 9347e1f..0abc146 100644 --- a/libf2c/libF77/r_atn2.c +++ b/libf2c/libF77/r_atn2.c @@ -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 --git a/libf2c/libF77/r_cnjg.c b/libf2c/libF77/r_cnjg.c index 756c694..3be7f6f 100644 --- a/libf2c/libF77/r_cnjg.c +++ b/libf2c/libF77/r_cnjg.c @@ -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 --git a/libf2c/libF77/r_cos.c b/libf2c/libF77/r_cos.c index 5bda158..380e250 100644 --- a/libf2c/libF77/r_cos.c +++ b/libf2c/libF77/r_cos.c @@ -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 --git a/libf2c/libF77/r_cosh.c b/libf2c/libF77/r_cosh.c index 7ae72cc..d133cf9 100644 --- a/libf2c/libF77/r_cosh.c +++ b/libf2c/libF77/r_cosh.c @@ -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 --git a/libf2c/libF77/r_dim.c b/libf2c/libF77/r_dim.c index baca95c..fe3896b 100644 --- a/libf2c/libF77/r_dim.c +++ b/libf2c/libF77/r_dim.c @@ -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 --git a/libf2c/libF77/r_exp.c b/libf2c/libF77/r_exp.c index d1dea75..2a9581c 100644 --- a/libf2c/libF77/r_exp.c +++ b/libf2c/libF77/r_exp.c @@ -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 --git a/libf2c/libF77/r_imag.c b/libf2c/libF77/r_imag.c index d51252b..42042a9 100644 --- a/libf2c/libF77/r_imag.c +++ b/libf2c/libF77/r_imag.c @@ -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 --git a/libf2c/libF77/r_int.c b/libf2c/libF77/r_int.c index 8378e77..b2a4747 100644 --- a/libf2c/libF77/r_int.c +++ b/libf2c/libF77/r_int.c @@ -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 --git a/libf2c/libF77/r_lg10.c b/libf2c/libF77/r_lg10.c index 51f8420..36336cb 100644 --- a/libf2c/libF77/r_lg10.c +++ b/libf2c/libF77/r_lg10.c @@ -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 --git a/libf2c/libF77/r_log.c b/libf2c/libF77/r_log.c index 4873fb4..3cc069d 100644 --- a/libf2c/libF77/r_log.c +++ b/libf2c/libF77/r_log.c @@ -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 --git a/libf2c/libF77/r_mod.c b/libf2c/libF77/r_mod.c index faea344..c2a1929 100644 --- a/libf2c/libF77/r_mod.c +++ b/libf2c/libF77/r_mod.c @@ -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 --git a/libf2c/libF77/r_nint.c b/libf2c/libF77/r_nint.c index f5382af..79700c8 100644 --- a/libf2c/libF77/r_nint.c +++ b/libf2c/libF77/r_nint.c @@ -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 --git a/libf2c/libF77/r_sign.c b/libf2c/libF77/r_sign.c index df6d02a..01defda 100644 --- a/libf2c/libF77/r_sign.c +++ b/libf2c/libF77/r_sign.c @@ -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 --git a/libf2c/libF77/r_sin.c b/libf2c/libF77/r_sin.c index 095b951..9d7db2c 100644 --- a/libf2c/libF77/r_sin.c +++ b/libf2c/libF77/r_sin.c @@ -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 --git a/libf2c/libF77/r_sinh.c b/libf2c/libF77/r_sinh.c index 3bf4bb1..47b6ad8 100644 --- a/libf2c/libF77/r_sinh.c +++ b/libf2c/libF77/r_sinh.c @@ -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 --git a/libf2c/libF77/r_sqrt.c b/libf2c/libF77/r_sqrt.c index d0203d3..114cd1b 100644 --- a/libf2c/libF77/r_sqrt.c +++ b/libf2c/libF77/r_sqrt.c @@ -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 --git a/libf2c/libF77/r_tan.c b/libf2c/libF77/r_tan.c index fc0009e..455c964 100644 --- a/libf2c/libF77/r_tan.c +++ b/libf2c/libF77/r_tan.c @@ -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 --git a/libf2c/libF77/r_tanh.c b/libf2c/libF77/r_tanh.c index 818c6a8..9fe150e 100644 --- a/libf2c/libF77/r_tanh.c +++ b/libf2c/libF77/r_tanh.c @@ -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 --git a/libf2c/libF77/s_cat.c b/libf2c/libF77/s_cat.c index 77a94f6..470a3da 100644 --- a/libf2c/libF77/s_cat.c +++ b/libf2c/libF77/s_cat.c @@ -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 --git a/libf2c/libF77/s_cmp.c b/libf2c/libF77/s_cmp.c index 1e052f286..febc586 100644 --- a/libf2c/libF77/s_cmp.c +++ b/libf2c/libF77/s_cmp.c @@ -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 --git a/libf2c/libF77/s_copy.c b/libf2c/libF77/s_copy.c index d167351..a0c98ca 100644 --- a/libf2c/libF77/s_copy.c +++ b/libf2c/libF77/s_copy.c @@ -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 --git a/libf2c/libF77/s_paus.c b/libf2c/libF77/s_paus.c index a7733a5..3fe256c 100644 --- a/libf2c/libF77/s_paus.c +++ b/libf2c/libF77/s_paus.c @@ -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 --git a/libf2c/libF77/s_rnge.c b/libf2c/libF77/s_rnge.c index 766889b..833d3e1 100644 --- a/libf2c/libF77/s_rnge.c +++ b/libf2c/libF77/s_rnge.c @@ -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 --git a/libf2c/libF77/s_stop.c b/libf2c/libF77/s_stop.c index 975edb7..6e8652a 100644 --- a/libf2c/libF77/s_stop.c +++ b/libf2c/libF77/s_stop.c @@ -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 --git a/libf2c/libF77/setarg.c b/libf2c/libF77/setarg.c index 929860a..83aedaf 100644 --- a/libf2c/libF77/setarg.c +++ b/libf2c/libF77/setarg.c @@ -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 --git a/libf2c/libF77/setsig.c b/libf2c/libF77/setsig.c index 8fde2fa..38fce0a 100644 --- a/libf2c/libF77/setsig.c +++ b/libf2c/libF77/setsig.c @@ -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 --git a/libf2c/libF77/sig_die.c b/libf2c/libF77/sig_die.c index bebb1e7..507c7ee 100644 --- a/libf2c/libF77/sig_die.c +++ b/libf2c/libF77/sig_die.c @@ -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 --git a/libf2c/libF77/signal1.h0 b/libf2c/libF77/signal1.h0 index a383774..d6d7b55 100644 --- a/libf2c/libF77/signal1.h0 +++ b/libf2c/libF77/signal1.h0 @@ -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 --git a/libf2c/libF77/signal_.c b/libf2c/libF77/signal_.c index b0d7ce6..ff496a1 100644 --- a/libf2c/libF77/signal_.c +++ b/libf2c/libF77/signal_.c @@ -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 --git a/libf2c/libF77/system_.c b/libf2c/libF77/system_.c index ed024a1..ebb3041 100644 --- a/libf2c/libF77/system_.c +++ b/libf2c/libF77/system_.c @@ -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 --git a/libf2c/libF77/z_abs.c b/libf2c/libF77/z_abs.c index 7e67ad2..5037565 100644 --- a/libf2c/libF77/z_abs.c +++ b/libf2c/libF77/z_abs.c @@ -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 --git a/libf2c/libF77/z_cos.c b/libf2c/libF77/z_cos.c index 2d4a24d..74ee2e4 100644 --- a/libf2c/libF77/z_cos.c +++ b/libf2c/libF77/z_cos.c @@ -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 --git a/libf2c/libF77/z_div.c b/libf2c/libF77/z_div.c index e14df32..d0b5944 100644 --- a/libf2c/libF77/z_div.c +++ b/libf2c/libF77/z_div.c @@ -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 --git a/libf2c/libF77/z_exp.c b/libf2c/libF77/z_exp.c index ecf8429..2dad121 100644 --- a/libf2c/libF77/z_exp.c +++ b/libf2c/libF77/z_exp.c @@ -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 --git a/libf2c/libF77/z_log.c b/libf2c/libF77/z_log.c index 9dcc7f7..09f8cd4 100644 --- a/libf2c/libF77/z_log.c +++ b/libf2c/libF77/z_log.c @@ -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 --git a/libf2c/libF77/z_sin.c b/libf2c/libF77/z_sin.c index e24caff..1294d22 100644 --- a/libf2c/libF77/z_sin.c +++ b/libf2c/libF77/z_sin.c @@ -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 --git a/libf2c/libF77/z_sqrt.c b/libf2c/libF77/z_sqrt.c index c04e8f0..94560ed 100644 --- a/libf2c/libF77/z_sqrt.c +++ b/libf2c/libF77/z_sqrt.c @@ -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; |