Move internal EXFUNs to top level. The alpha compiler gets confused.

diff --git a/v7/src/microcode/bchmmg.c b/v7/src/microcode/bchmmg.c
index b589a2197505b4e9e490a3552af46a7e87877ac2..0815fa5e86e38c6f82a74f1511ce4c9678a4c438 100644 (file)
--- a/v7/src/microcode/bchmmg.c
+++ b/v7/src/microcode/bchmmg.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/bchmmg.c,v 9.68 1992/02/03 23:02:15 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/bchmmg.c,v 9.69 1992/02/10 13:29:50 jinx Exp $
 
 Copyright (c) 1987-1992 Massachusetts Institute of Technology
 
@@ -176,14 +176,14 @@ DEFUN (io_error_always_abort, (operation_name, noise),
   return (1);
 }
 
+extern char EXFUN (userio_choose_option,
+                  (CONST char *, CONST char *, CONST char **));
+extern int EXFUN (userio_confirm, (CONST char *));
+
 int 
 DEFUN (io_error_retry_p, (operation_name, noise),
        char * operation_name AND char * noise)
 {
-  extern char EXFUN (userio_choose_option,
-                    (const char *, const char *, const char **));
-  extern int EXFUN (userio_confirm, (const char *));
-
   static CONST char * retry_choices [] =
     {
       "A = abort the operation",
@@ -483,13 +483,14 @@ static long default_sleep_period = 20 MILLISEC;
 #define GET_SLEEP_DELTA()      default_sleep_period
 #define SET_SLEEP_DELTA(value) default_sleep_period = (value)
 
+extern int EXFUN (select, (int, int *, int *, int *, struct timeval *));
+
 static void
 DEFUN (sleep_awaiting_drones, (microsec, mask),
        unsigned int microsec AND unsigned long mask)
 {
   int dummy, saved_errno;
   struct timeval timeout;
-  extern int EXFUN (select, (int, int *, int *, int *, struct timeval *));
 
   dummy = 0;
   timeout.tv_sec = 0;
@@ -677,13 +678,14 @@ DEFUN (probe_gc_drone, (drone), struct drone_info * drone)
   return (result == 0);
 }
 
+static void EXFUN (handle_drone_death, (struct drone_info *));
+
 static void
 DEFUN (probe_all_gc_drones, (wait_p), int wait_p)
 {
   int count;
   unsigned long running;
   struct drone_info * drone;
-  static void EXFUN (handle_drone_death, (struct drone_info *));
 
   do {
     for (count = 0, drone = gc_drones, running = ((unsigned long) 0);
@@ -712,14 +714,14 @@ DEFUN (probe_all_gc_drones, (wait_p), int wait_p)
   return;
 }
 \f
+static void EXFUN (open_gc_file, (long, int));
+
 static int
 DEFUN (sysV_initialize, (first_time_p, size, r_overlap, w_overlap, drfnam),
        int first_time_p
        AND long size AND int r_overlap AND int w_overlap
        AND CONST char * drfnam)
 {
-  static void EXFUN (open_gc_file, (long, int));
-
   SCHEME_OBJECT * bufptr;
   int cntr;
   long buffer_space, shared_size, malloc_size;
@@ -937,11 +939,11 @@ DEFUN (sysV_initialize, (first_time_p, size, r_overlap, w_overlap, drfnam),
   return (0);
 }
 \f
+static void EXFUN (close_gc_file, (int));
+
 static void
 DEFUN (sysV_shutdown, (final_time_p), int final_time_p)
 {
-  static void EXFUN (close_gc_file, (int));
-
   /* arg should be (n_gc_drones > 0), see sysV_initialize */
   if (final_time_p)
     close_gc_file (1);
@@ -1805,12 +1807,13 @@ DEFUN (termination_open_gc_file, (operation, extra),
   /*NOTREACHED*/
 }
 
+extern char * EXFUN (mktemp, (char *));
+extern long EXFUN (lseek, (int, long, int));
+
 static void
 DEFUN (open_gc_file, (size, unlink_p),
        long size AND int unlink_p)
 {
-  extern char * EXFUN (mktemp, (char *));
-  extern long EXFUN (lseek, (int, long, int));
   struct stat file_info;
   int position, flags;
   Boolean exists_p;
@@ -1891,7 +1894,7 @@ DEFUN (open_gc_file, (size, unlink_p),
   keep_gc_file_p = (exists_p || option_gc_keep);
   if (!keep_gc_file_p && unlink_p)
   {
-    extern int EXFUN (unlink, (const char *));
+    extern int EXFUN (unlink, (CONST char *));
 
     (void) (unlink (gc_file_name));
   }

diff --git a/v7/src/microcode/uxio.c b/v7/src/microcode/uxio.c
index 51fcd75fc7959e52639c6fbdbec89821aec239cc..d21f639b7cf640ae89b2fb4c081e2f39586c7e41 100644 (file)
--- a/v7/src/microcode/uxio.c
+++ b/v7/src/microcode/uxio.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/uxio.c,v 1.18 1992/02/04 04:37:03 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/uxio.c,v 1.19 1992/02/10 13:26:10 jinx Exp $
 
-Copyright (c) 1990-92 Massachusetts Institute of Technology
+Copyright (c) 1990-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -65,11 +65,11 @@ DEFUN_VOID (UX_channel_close_all)
       OS_channel_close_noerror (channel);
 }
 
+extern void EXFUN (add_reload_cleanup, (void (*) (void)));
+
 void
 DEFUN_VOID (UX_initialize_channels)
 {
-  extern void EXFUN (add_reload_cleanup, (void (*) (void)));
-
   OS_channel_table_size = (UX_SC_OPEN_MAX ());
   channel_table =
     (UX_malloc (OS_channel_table_size * (sizeof (struct channel))));
@@ -238,12 +238,13 @@ DEFUN (OS_channel_write_dump_file, (channel, buffer, nbytes),
   return ((scr < 0) ? 0 : scr);
 }
 
+extern int EXFUN (strlen, (const char *));
+
 void
 DEFUN (OS_channel_write_string, (channel, string),
        Tchannel channel AND
        CONST char * string)
 {
-  extern int EXFUN (strlen, (const char *));
   unsigned long length = (strlen (string));
   if ((OS_channel_write (channel, string, length)) != length)
     error_external_return ();
@@ -359,19 +360,19 @@ DEFUN (OS_channel_unregister, (channel), Tchannel channel)
 }
 \f
 #ifdef HAVE_SELECT
-CONST int UX_have_select_p = 1;
+  CONST int UX_have_select_p = 1;
+  extern int EXFUN (UX_select,
+                   (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *,
+                    struct timeval *));
+  extern int EXFUN (UX_process_any_status_change, (void));
 #else
-CONST int UX_have_select_p = 0;
+  CONST int UX_have_select_p = 0;
 #endif
 
 enum select_input
 DEFUN (UX_select_input, (fd, blockp), int fd AND int blockp)
 {
 #ifdef HAVE_SELECT
-  extern int EXFUN (UX_select,
-                   (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *,
-                    struct timeval *));
-  extern int EXFUN (UX_process_any_status_change, (void));
   int status_change_p;
   int nfds;
   SELECT_TYPE readable;