X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbsd-os.h;h=d95431df0fbc5c59c6e1fe57362369160bd8aa02;hb=2b88fb32146f381eaa7b20d8b829af92841d63d4;hp=3cbf029c2268cbed91c4ff8d8b067bd7d4bf370a;hpb=422b88abf96f4842a3d0999cd3b80d96f5a153d6;p=sbcl.git

diff --git a/src/runtime/bsd-os.h b/src/runtime/bsd-os.h
index 3cbf029..d95431d 100644
--- a/src/runtime/bsd-os.h
+++ b/src/runtime/bsd-os.h
@@ -37,6 +37,7 @@ typedef struct sigaltstack stack_t;
  * original FreeBSD port of SBCL, that's wrong, it's actually a
  * ucontext_t. */
 
+#include <sys/ucontext.h>
 typedef ucontext_t os_context_t;
 /* As the sbcl-devel message from Raymond Wiker 2000-12-01, FreeBSD
  * (unlike Linux and OpenBSD) doesn't let us tweak the CPU's single
@@ -47,6 +48,17 @@ typedef ucontext_t os_context_t;
 #elif defined __OpenBSD__
 typedef struct sigcontext os_context_t;
 #define SIG_MEMORY_FAULT SIGSEGV
+#elif defined DARWIN
+  /* man pages claim that the third argument is a sigcontext struct,
+     but ucontext_t is defined, matches sigcontext where sensible,
+     offers better access to mcontext, and is of course the SUSv2-
+     mandated type of the third argument, so we use that instead.
+     If Apple is going to break ucontext_t out of spite, I'm going
+     to be cross with them ;) -- PRM */
+
+#include <ucontext.h>
+typedef ucontext_t os_context_t;
+#define SIG_MEMORY_FAULT SIGBUS
 #else
 #error unsupported BSD variant
 #endif