From 1f1b4b0abc70084e17805acc580c77250b901966 Mon Sep 17 00:00:00 2001
From: Craig Burley <burley@gnu.org>
Date: Mon, 10 May 1999 14:18:54 +0000
Subject: Update to Netlib version of 1999-05-10

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/Netlib_branch@26863 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libf2c/libF77/Version.c | 4 +++-
 libf2c/libF77/abort_.c  | 4 +---
 libf2c/libF77/c_log.c   | 6 +++---
 libf2c/libF77/ef1asc_.c | 4 +---
 libf2c/libF77/s_rnge.c  | 4 +---
 libf2c/libF77/s_stop.c  | 9 +++++++--
 libf2c/libI77/Version.c | 3 ++-
 libf2c/libI77/open.c    | 4 ++--
 8 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/libf2c/libF77/Version.c b/libf2c/libF77/Version.c
index 64d70fa91c2..3b2bbe64b92 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";
 
 /*
 2.00	11 June 1980.  File version.c added to library.
@@ -54,4 +54,6 @@ static char junk[] = "\n@(#)LIBF77 VERSION 19990502\n";
 			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.
 */
diff --git a/libf2c/libF77/abort_.c b/libf2c/libF77/abort_.c
index 9d4a0568ec7..889c89fbb4e 100644
--- a/libf2c/libF77/abort_.c
+++ b/libf2c/libF77/abort_.c
@@ -12,7 +12,5 @@ int abort_(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 6ac990ca267..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;
-	r->i = atan2(zi = z->i, z->r);
-	r->r = log( f__cabs(z->r, 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 b2b8d72a781..f07103d7fbd 100644
--- a/libf2c/libF77/ef1asc_.c
+++ b/libf2c/libF77/ef1asc_.c
@@ -15,7 +15,5 @@ int ef1asc_(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 b200fce1bf3..e86143c4e68 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 be3c28ba5e5..fb57bde4877 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
diff --git a/libf2c/libI77/Version.c b/libf2c/libI77/Version.c
index ea4c0fdb24e..3a9fa2e0de4 100644
--- a/libf2c/libI77/Version.c
+++ b/libf2c/libI77/Version.c
@@ -1,4 +1,4 @@
-static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 19990502\n";
+static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 19990503\n";
 
 /*
 2.01	$ format added
@@ -295,3 +295,4 @@ wrtfmt.c:
 		 err.c: cast a pointer difference to (int) for %d.
 		 rdfmt.c: omit fixed-length buffer that could be overwritten
 		 by formats Inn or Lnn with nn > 83. */
+/* 3 May 1999:	open.c: insert two casts for machines with 64-bit longs. */
diff --git a/libf2c/libI77/open.c b/libf2c/libI77/open.c
index 2e88c293096..493aaea431f 100644
--- a/libf2c/libI77/open.c
+++ b/libf2c/libI77/open.c
@@ -184,7 +184,7 @@ integer f_open(olist *a)
 			opnerr(a->oerr,107,"open")
 		}
 	else
-		sprintf(buf, "fort.%ld", a->ounit);
+		sprintf(buf, "fort.%ld", (long)a->ounit);
 	b->uscrtch = 0;
 	b->uend=0;
 	b->uwrt = 0;
@@ -277,7 +277,7 @@ fk_open(int seq, int fmt, ftnint n)
 #endif
 {	char nbuf[10];
 	olist a;
-	(void) sprintf(nbuf,"fort.%ld",n);
+	(void) sprintf(nbuf,"fort.%ld",(long)n);
 	a.oerr=1;
 	a.ounit=n;
 	a.ofnm=nbuf;
-- 
cgit v1.2.3