diff options
Diffstat (limited to 'libf2c/libF77')
| -rw-r--r-- | libf2c/libF77/Version.c | 4 | ||||
| -rw-r--r-- | libf2c/libF77/abort_.c | 4 | ||||
| -rw-r--r-- | libf2c/libF77/c_log.c | 6 | ||||
| -rw-r--r-- | libf2c/libF77/ef1asc_.c | 4 | ||||
| -rw-r--r-- | libf2c/libF77/s_rnge.c | 4 | ||||
| -rw-r--r-- | libf2c/libF77/s_stop.c | 9 |
6 files changed, 16 insertions, 15 deletions
diff --git a/libf2c/libF77/Version.c b/libf2c/libF77/Version.c index a31379f510b..98a91098976 100644 --- a/libf2c/libF77/Version.c +++ b/libf2c/libF77/Version.c @@ -1,4 +1,4 @@ -static char junk[] = "\n@(#)LIBF77 VERSION 19990502\n"; +static char junk[] = "\n@(#)LIBF77 VERSION 19990503\n"; /* */ @@ -59,6 +59,8 @@ char __G77_LIBF77_VERSION__[] = "0.5.24"; c_cos.c, c_exp.c, c_sin.c, d_cnjg.c, r_cnjg.c, z_cos.c, z_exp.c, z_log.c, z_sin.c: cope fully with overlapping arguments caused by equivalence. + 3 May 1999: "invisible" tweaks to omit compiler warnings in + abort_.c, ef1asc_.c, s_rnge.c, s_stop.c. */ #include <stdio.h> diff --git a/libf2c/libF77/abort_.c b/libf2c/libF77/abort_.c index 8efdc42f970..f0c2f8df359 100644 --- a/libf2c/libF77/abort_.c +++ b/libf2c/libF77/abort_.c @@ -12,7 +12,5 @@ int G77_abort_0 (void) #endif { sig_die("Fortran abort routine called", 1); -#ifdef __cplusplus -return 0; -#endif +return 0; /* not reached */ } diff --git a/libf2c/libF77/c_log.c b/libf2c/libF77/c_log.c index 6e3df66653b..24d1a3c957b 100644 --- a/libf2c/libF77/c_log.c +++ b/libf2c/libF77/c_log.c @@ -11,7 +11,7 @@ extern double f__cabs(double, double); void c_log(complex *r, complex *z) #endif { - double zi = z->i, zr = z->r; - r->i = atan2(zi, zr); - r->r = log( f__cabs( zr, zi ) ); + double zi, zr; + r->i = atan2(zi = z->i, zr = z->r); + r->r = log( f__cabs(zr, zi) ); } diff --git a/libf2c/libF77/ef1asc_.c b/libf2c/libF77/ef1asc_.c index a922a1d9ba9..8588584fbab 100644 --- a/libf2c/libF77/ef1asc_.c +++ b/libf2c/libF77/ef1asc_.c @@ -15,7 +15,5 @@ int G77_ef1asc_0 (ftnint *a, ftnlen *la, ftnint *b, ftnlen *lb) #endif { s_copy( (char *)a, (char *)b, EVEN(*la), *lb ); -#ifdef __cplusplus -return 0; -#endif +return 0; /* ignored return value */ } diff --git a/libf2c/libF77/s_rnge.c b/libf2c/libF77/s_rnge.c index 189b5247ced..fbe3219d580 100644 --- a/libf2c/libF77/s_rnge.c +++ b/libf2c/libF77/s_rnge.c @@ -20,7 +20,5 @@ fprintf(stderr, ".\nAttempt to access the %ld-th element of variable ", offset+1 while((i = *varn) && i != ' ') putc(*varn++, stderr); sig_die(".", 1); -#ifdef __cplusplus -return 0; -#endif +return 0; /* not reached */ } diff --git a/libf2c/libF77/s_stop.c b/libf2c/libF77/s_stop.c index 2e3f1035b30..975edb7d4ad 100644 --- a/libf2c/libF77/s_stop.c +++ b/libf2c/libF77/s_stop.c @@ -30,8 +30,13 @@ if(n > 0) f_exit(); #endif exit(0); -#ifdef __cplusplus + +/* We cannot avoid (useless) compiler diagnostics here: */ +/* some compilers complain if there is no return statement, */ +/* and others complain that this one cannot be reached. */ + return 0; /* NOT REACHED */ } -#endif +#ifdef __cplusplus } +#endif |