--- gforth/engine/io.c	1997/06/15 19:43:48	1.2
+++ gforth/engine/io.c	1998/10/15 09:47:45	1.6
@@ -32,6 +32,11 @@
 #define _POSIX_VERSION
 #endif
 
+#if !defined(Solaris) && defined(sun) && defined(__svr4__)
+#define Solaris
+typedef unsigned int uint32_t;
+#endif
+
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
@@ -616,7 +621,7 @@ long key_avail (stream)
 	FILE *stream;
 {
   int tty = fileno (stream);
-  long chars_avail = pending;
+  int chars_avail = pending;
   int result;
 
   if(!terminal_prepped)  prep_terminal();
@@ -977,7 +982,7 @@ void install_signal_handlers (void)
     signal (sigs_to_ignore [i], SIG_IGN);
 */
   for (i = 0; i < DIM (sigs_to_throw); i++)
-    signal (sigs_to_throw [i], signal_throw);
+    signal (sigs_to_throw [i], die_on_signal ? graceful_exit : signal_throw);
   for (i = 0; i < DIM (sigs_to_quit); i++)
     signal (sigs_to_quit [i], graceful_exit);
 #ifdef SIGCONT