Actual synch with 3.3.5.

Changes in Makefile.bsd-wrapper to avoid prereq.

Fix in lib*/config.h.in to include the right ones and get the correct
definitions.

Bump of shlib_version accordingly.

1 files changed, 12 insertions, 15 deletions

diff --git a/gnu/lib/libf2c/libU77/link_.c b/gnu/lib/libf2c/libU77/link_.c
index 003fac8ffe2..f3070e4b6e9 100644
--- a/gnu/lib/libf2c/libU77/link_.c
+++ b/gnu/lib/libf2c/libU77/link_.c
@@ -34,30 +34,27 @@ Boston, MA 02111-1307, USA.  */
 #include <errno.h>		/* for ENOSYS */
 #include "f2c.h"
 
-#ifdef KR_headers
-void g_char ();
+void g_char (const char *a, ftnlen alen, char *b);
 
-integer G77_link_0 (path1, path2, Lpath1, Lpath2)
-     char *path1, *path2; ftnlen Lpath1, Lpath2;
-#else
-void g_char(const char *a, ftnlen alen, char *b);
-
-integer G77_link_0 (const char *path1, const char *path2, const ftnlen Lpath1, const ftnlen Lpath2)
-#endif
+integer
+G77_link_0 (const char *path1, const char *path2, const ftnlen Lpath1,
+	    const ftnlen Lpath2)
 {
 #if defined (HAVE_LINK)
   char *buff1, *buff2;
-  char *bp, *blast;
   int i;
 
-  buff1 = malloc (Lpath1+1);
-  if (buff1 == NULL) return -1;
+  buff1 = malloc (Lpath1 + 1);
+  if (buff1 == NULL)
+    return -1;
   g_char (path1, Lpath1, buff1);
-  buff2 = malloc (Lpath2+1);
-  if (buff2 == NULL) return -1;
+  buff2 = malloc (Lpath2 + 1);
+  if (buff2 == NULL)
+    return -1;
   g_char (path2, Lpath2, buff2);
   i = link (buff1, buff2);
-  free (buff1); free (buff2);
+  free (buff1);
+  free (buff2);
   return i ? errno : 0;
 #else /* ! HAVE_LINK */
   errno = ENOSYS;