8 files changed, 43 insertions, 9 deletions

diff --git a/contrib/libf2c/ChangeLog b/contrib/libf2c/ChangeLog
index 6d0e6db5b1c19..6f57ca24198b7 100644
--- a/contrib/libf2c/ChangeLog
+++ b/contrib/libf2c/ChangeLog
@@ -1,3 +1,22 @@
+2000-07-03  Donn Terry  (donnte@microsoft.com)
+        * libU77/aclocal.m4: check for 2 argument gettimeofday without
+	struct timezone
+
+2000-07-02  Toon Moene  <toon@moene.indiv.nluug.nl>
+	* libF77/Version.c: Bumped version number to 0.5.26.
+	* libI77/Version.c: Ditto.
+	* libU77/Version.c: Ditto.
+
+2000-06-21  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* libU77/dtime_.c, libU77/etime_.c: Include stdlib.h if
+	HAVE_STDLIB_H is defined.
+
+2000-06-11  Herman A.J. ten Brugge  <Haj.Ten.Brugge@net.HCC.nl>
+
+	* rdfmt.c (rd_L): Use if-then-else instead of case statement to
+	solve problems when sizeof(char) == sizeof(short).
+
 2000-05-18  Chris Demetriou  <cgd@sibyte.com>
 
 	* configure.in: Test for __g77_integer, __g77_uinteger,
diff --git a/contrib/libf2c/libF77/Version.c b/contrib/libf2c/libF77/Version.c
index 8705161c26829..a1cb51fe41444 100644
--- a/contrib/libf2c/libF77/Version.c
+++ b/contrib/libf2c/libF77/Version.c
@@ -3,7 +3,7 @@ static char junk[] = "\n@(#)LIBF77 VERSION 19991115\n";
 /*
 */
 
-char __G77_LIBF77_VERSION__[] = "0.5.25 20000603 (prerelease)";
+char __G77_LIBF77_VERSION__[] = "0.5.26 20000711 (prerelease)";
 
 /*
 2.00	11 June 1980.  File version.c added to library.
diff --git a/contrib/libf2c/libI77/Version.c b/contrib/libf2c/libI77/Version.c
index adc2311a65689..64b31bc7812e6 100644
--- a/contrib/libf2c/libI77/Version.c
+++ b/contrib/libf2c/libI77/Version.c
@@ -3,7 +3,7 @@ static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 19991115\n";
 /*
 */
 
-char __G77_LIBI77_VERSION__[] = "0.5.25 20000603 (prerelease)";
+char __G77_LIBI77_VERSION__[] = "0.5.26 20000711 (prerelease)";
 
 /*
 2.01	$ format added
diff --git a/contrib/libf2c/libI77/rdfmt.c b/contrib/libf2c/libI77/rdfmt.c
index 08ff0e827b4e4..f2b121193a7b6 100644
--- a/contrib/libf2c/libI77/rdfmt.c
+++ b/contrib/libf2c/libI77/rdfmt.c
@@ -208,11 +208,15 @@ rd_L(ftnint *n, int w, ftnlen len)
 	  case '\n':
 		return errno = 116;
 		}
-	switch(len) {
-		case sizeof(char):	*(char *)n = (char)lv;	 break;
-		case sizeof(short):	*(short *)n = (short)lv; break;
-		default:		*n = lv;
-		}
+	/* The switch statement that was here
+	   didn't cut it:  It broke down for targets
+	   where sizeof(char) == sizeof(short). */
+	if (len == sizeof(char))
+		*(char *)n = (char)lv;
+	else if (len == sizeof(short))
+		*(short *)n = (short)lv;
+	else
+		*n = lv;
 	while(w-- > 0) {
 		GET(ch);
 		if (ch == ',' || ch == '\n')
diff --git a/contrib/libf2c/libU77/Version.c b/contrib/libf2c/libU77/Version.c
index fb31ed4fa36cc..c6715fd7bba26 100644
--- a/contrib/libf2c/libU77/Version.c
+++ b/contrib/libf2c/libU77/Version.c
@@ -1,6 +1,6 @@
 static char junk[] = "\n@(#) LIBU77 VERSION 19980709\n";
 
-char __G77_LIBU77_VERSION__[] = "0.5.25 20000603 (prerelease)";
+char __G77_LIBU77_VERSION__[] = "0.5.26 20000711 (prerelease)";
 
 #include <stdio.h>
 
diff --git a/contrib/libf2c/libU77/aclocal.m4 b/contrib/libf2c/libU77/aclocal.m4
index b9a74fd82f612..58f6a675899a1 100644
--- a/contrib/libf2c/libU77/aclocal.m4
+++ b/contrib/libf2c/libU77/aclocal.m4
@@ -54,8 +54,13 @@ main ()
       ],
       [
       struct timeval time;
+#ifdef HAVE_TIMEZONE
       struct timezone dummy;
-      gettimeofday (&time, &dummy);],
+#define DUMMY &dummy
+#else
+#define DUMMY NULL
+#endif
+      gettimeofday (&time, DUMMY);],
       emacs_cv_gettimeofday_two_arguments=yes,
       emacs_cv_gettimeofday_two_arguments=no))
     if test $emacs_cv_gettimeofday_two_arguments = no; then
diff --git a/contrib/libf2c/libU77/dtime_.c b/contrib/libf2c/libU77/dtime_.c
index aa34bc027e088..19100e698de6f 100644
--- a/contrib/libf2c/libU77/dtime_.c
+++ b/contrib/libf2c/libU77/dtime_.c
@@ -19,6 +19,9 @@ Boston, MA 02111-1307, USA.  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#if HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
 #if HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
diff --git a/contrib/libf2c/libU77/etime_.c b/contrib/libf2c/libU77/etime_.c
index eae559f74147c..88eead3fbb47c 100644
--- a/contrib/libf2c/libU77/etime_.c
+++ b/contrib/libf2c/libU77/etime_.c
@@ -19,6 +19,9 @@ Boston, MA 02111-1307, USA.  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#if HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
 #if HAVE_UNISTD_H
 #  include <unistd.h>
 #endif