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, 11 insertions, 17 deletions

diff --git a/gnu/lib/libf2c/libU77/vxtidate_.c b/gnu/lib/libf2c/libU77/vxtidate_.c
index e5963af42e6..0563a9120d6 100644
--- a/gnu/lib/libf2c/libU77/vxtidate_.c
+++ b/gnu/lib/libf2c/libU77/vxtidate_.c
@@ -38,34 +38,28 @@ Boston, MA 02111-1307, USA.  */
 /* VMS style: */
 
 /* Subroutine */
-#ifdef KR_headers
-int G77_vxtidate_y2kbug_0 (m, d, y)
-     integer *y, *m, *d;
-#else
-int G77_vxtidate_y2kbug_0 (integer *m, integer *d, integer *y)
-#endif
+int
+G77_vxtidate_y2kbug_0 (integer * m, integer * d, integer * y)
 {
   struct tm *lt;
   time_t tim;
-  tim = time(NULL);
-  lt = localtime(&tim);
+  tim = time (NULL);
+  lt = localtime (&tim);
   *y = lt->tm_year % 100;
-  *m = lt->tm_mon+1;
+  *m = lt->tm_mon + 1;
   *d = lt->tm_mday;
   return 0;
 }
 
 #ifdef PIC
 extern const char *G77_Non_Y2K_Compliance_Message;
-#  ifdef KR_headers
-int G77_vxtidate_y2kbuggy_0 (m, d, y)
-     integer *y, *m, *d;
-#  else
-int G77_vxtidate_y2kbuggy_0 (integer *m, integer *d, integer *y)
-#  endif
+int
+G77_vxtidate_y2kbuggy_0 (integer * m __attribute__ ((__unused__)),
+			 integer * d __attribute__ ((__unused__)),
+			 integer * y __attribute__ ((__unused__)))
 {
-  extern int G77_abort_0();
+  extern int G77_abort_0 ();
   fprintf (stderr, "%s\n", G77_Non_Y2K_Compliance_Message);
-  G77_abort_0();
+  G77_abort_0 ();
 }
 #endif