--- a/src/cmdloop.c	Mon Aug 13 09:54:24 2007 +0200
+++ b/src/cmdloop.c	Mon Aug 13 09:55:28 2007 +0200
@@ -277,7 +277,7 @@
       (!CONSOLEP (Vselected_console) ||
        CONSOLE_STREAM_P (XCONSOLE (Vselected_console))))
     Fkill_emacs (make_int (-1));
-  
+
   /* End of -batch run causes exit here. */
   if (noninteractive)
     Fkill_emacs (Qt);
@@ -417,7 +417,7 @@
   XCONSOLE (Vselected_console)->prefix_arg = Qnil;
   if (NILP (catch_errors))
     Fcommand_loop_1 ();
-  else 
+  else
     internal_catch (Qtop_level,
                     cold_load_command_loop, Qnil, 0);
   goto loop;
@@ -434,7 +434,7 @@
   if (CONSP (datum) && EQ (XCAR (datum), Qquit))
     /* Don't bother with the message */
     return (Qt);
-      
+
   message ("Error in command-loop!!");
   Fset (intern ("last-error"), datum); /* #### Better/different name? */
   Fsit_for (make_int (2), Qnil);
@@ -561,7 +561,7 @@
 
       if (!was_locked)
 	any_console_state ();
-#if defined (__SUNPRO_C) || (defined (DEC_ALPHA) && defined (OSF1))
+#if defined (__SUNPRO_C) || defined (__SUNPRO_CC) || (defined (DEC_ALPHA) && defined (OSF1))
       if (0) return Qnil; /* Shut up compiler */
 #endif
     }