--- a/src/signal.c	Mon Aug 13 10:27:41 2007 +0200
+++ b/src/signal.c	Mon Aug 13 10:28:48 2007 +0200
@@ -21,9 +21,6 @@
 
 /* Synched up with: Not synched with FSF.  Split out of keyboard.c. */
 
-/* Just to make sure we don't use any global vars below */
-#define DONT_DECLARE_MAC_VARS
-
 #include <config.h>
 #include "lisp.h"
 
@@ -34,6 +31,9 @@
 #include "syssignal.h"
 #include "systime.h"
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include <errno.h>
 
 /* Set to 1 when a quit-check signal (either a SIGIO interrupt or
@@ -309,7 +309,7 @@
 
      #### This is a bit inefficient because there will be function call
      overhead each time QUIT occurs. */
-     
+
   if (!NILP (Vinhibit_quit))
     {
       something_happened = 1;
@@ -359,7 +359,7 @@
 */
        ())
 {
-  return ((waiting_for_user_input_p) ? Qt : Qnil);
+  return waiting_for_user_input_p ? Qt : Qnil;
 }
 
 
@@ -471,7 +471,7 @@
 
 /* The effect of this function is to set Vquit_flag if the user pressed
    ^G and discard the ^G, so as to not notice the same ^G again. */
-int 
+int
 check_quit (void)
 {
   /* dont_check_for_quit is set in two circumstances:
@@ -520,7 +520,7 @@
   return check_quit ();
 }
 
-  
+
 
 void
 init_poll_for_quit (void)