Rewrite code that the Sun compiler won't accept.

diff --git a/v7/src/microcode/uxsig.c b/v7/src/microcode/uxsig.c
index 8dd4d4dbd36aca12884ddbf6adce35323758ad50..8eac58b4e8551501b200d8302ad74e8e2b05a1bb 100644 (file)
--- a/v7/src/microcode/uxsig.c
+++ b/v7/src/microcode/uxsig.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: uxsig.c,v 1.30 1994/02/18 21:14:18 cph Exp $
+$Id: uxsig.c,v 1.31 1994/05/03 08:01:16 cph Exp $
 
 Copyright (c) 1990-94 Massachusetts Institute of Technology
 
@@ -501,16 +501,30 @@ DEFUN_VOID (OS_restartable_exit)
   stop_signal_default (SIGTSTP);
 }
 
+/* The following conditionalization would more naturally be expressed
+   by conditionalizing the code inside the handler, but the Sun
+   compiler won't accept this conditionalization.  */
+
+#ifdef HAVE_ITIMER
+
+static
+DEFUN_STD_HANDLER (sighnd_timer,
+{
+  request_timer_interrupt ();
+})
+
+#else /* not HAVE_ITIMER */
+
 static
 DEFUN_STD_HANDLER (sighnd_timer,
 {
-#ifndef HAVE_ITIMER
   extern void EXFUN (reschedule_alarm, (void));
   reschedule_alarm ();
-#endif
   request_timer_interrupt ();
 })
 
+#endif /* not HAVE_ITIMER */
+
 static
 DEFUN_STD_HANDLER (sighnd_save_then_terminate,
   (request_suspend_interrupt ()))