X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.h;h=07b4a2d1e7c40ecd03156a7d6e734654002d7833;hb=bf40ae88bc289fd765a33861cc4bc0853ed483ba;hp=a14823696f180cfbf4bee83122c7b2dd234907f5;hpb=e6f4c7523aa628ece995ee01879d3fb90eed6d9f;p=sbcl.git

diff --git a/src/runtime/interrupt.h b/src/runtime/interrupt.h
index a148236..07b4a2d 100644
--- a/src/runtime/interrupt.h
+++ b/src/runtime/interrupt.h
@@ -12,7 +12,7 @@
 #if !defined(_INCLUDE_INTERRUPT_H_)
 #define _INCLUDE_INTERRUPT_H_
 
-#include <signal.h>
+#include "runtime.h"
 #include <string.h>
 
 /*
@@ -24,7 +24,12 @@
  * stack by the kernel, so copying a libc-sized sigset_t into it will
  * overflow and cause other data on the stack to be corrupted */
 /* FIXME: do not rely on NSIG being a multiple of 8 */
-#define REAL_SIGSET_SIZE_BYTES ((NSIG/8))
+
+#ifdef LISP_FEATURE_WIN32
+# define REAL_SIGSET_SIZE_BYTES (4)
+#else
+# define REAL_SIGSET_SIZE_BYTES ((NSIG/8))
+#endif
 
 static inline void
 sigcopyset(sigset_t *new, sigset_t *old)
@@ -113,7 +118,7 @@ struct interrupt_data {
      * and with no pending handler. Both deferrable interrupt handlers
      * and gc are careful not to clobber each other's pending_mask. */
     boolean gc_blocked_deferrables;
-#ifdef LISP_FEATURE_PPC
+#ifdef GENCGC_IS_PRECISE
     /* On PPC when consing wants to turn to alloc(), it does so via a
      * trap. When alloc() wants to save the sigmask it consults
      * allocation_trap_context. It does not look up the most recent
@@ -152,8 +157,9 @@ typedef void (*interrupt_handler_t)(int, siginfo_t *, os_context_t *);
 extern void undoably_install_low_level_interrupt_handler (
                         int signal,
                         interrupt_handler_t handler);
-extern unsigned long install_handler(int signal,
-                                     interrupt_handler_t handler);
+extern uword_t install_handler(int signal,
+                               interrupt_handler_t handler,
+                               int synchronous);
 
 extern union interrupt_handler interrupt_handlers[NSIG];
 
@@ -177,8 +183,9 @@ extern void lower_thread_control_stack_guard_page(struct thread *th);
 extern void reset_thread_control_stack_guard_page(struct thread *th);
 
 #if defined(LISP_FEATURE_SB_SAFEPOINT) && !defined(LISP_FEATURE_WIN32)
-void rtmin0_handler(int signal, siginfo_t *info, os_context_t *context);
-void rtmin1_handler(int signal, siginfo_t *info, os_context_t *context);
+# ifdef LISP_FEATURE_SB_THRUPTION
+void thruption_handler(int signal, siginfo_t *info, os_context_t *context);
+# endif
 #endif
 
 #endif