1.0.10.37: fix x86-64/darwin build

 * use MAC_OS_X_VERSION_10_5 instead of __DARWIN_UNIX03 as the test
   for new style headers as __DARWIN_UNIX03 is defined when building
   x86-64 on 10.4

diff --git a/src/runtime/darwin-os.h b/src/runtime/darwin-os.h
index bc39a33..2a7a405 100644 (file)
--- a/src/runtime/darwin-os.h
+++ b/src/runtime/darwin-os.h
@@ -5,6 +5,7 @@
 
 #include <mach/mach_init.h>
 #include <mach/task.h>
+#include <AvailabilityMacros.h>
 
 /* man pages claim that the third argument is a sigcontext struct,
    but ucontext_t is defined, matches sigcontext where sensible,
@@ -16,7 +17,7 @@
 #if defined(LISP_FEATURE_X86)
 #include <sys/ucontext.h>
 #include <sys/_types.h>
-#if __DARWIN_UNIX03
+#ifdef MAC_OS_X_VERSION_10_5
 typedef struct __darwin_ucontext os_context_t;
 #else
 typedef struct ucontext os_context_t;

diff --git a/src/runtime/x86-64-arch.c b/src/runtime/x86-64-arch.c
index 6a6e53b..9f590e9 100644 (file)
--- a/src/runtime/x86-64-arch.c
+++ b/src/runtime/x86-64-arch.c
@@ -63,7 +63,7 @@ context_eflags_addr(os_context_t *context)
 #elif defined __FreeBSD__
     return &context->uc_mcontext.mc_rflags;
 #elif defined LISP_FEATURE_DARWIN
-#if defined __DARWIN_UNIX03
+#ifdef MAC_OS_X_VERSION_10_5
     return &context->uc_mcontext->__ss.__rflags;
 #else
     return &context->uc_mcontext->ss.rflags;

diff --git a/src/runtime/x86-64-darwin-os.c b/src/runtime/x86-64-darwin-os.c
index c1055c0..83a1f1e 100644 (file)
--- a/src/runtime/x86-64-darwin-os.c
+++ b/src/runtime/x86-64-darwin-os.c
@@ -25,11 +25,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#if __DARWIN_UNIX03
+#ifdef MAC_OS_X_VERSION_10_5
 #include <sys/_structs.h>
 #endif
 
-#if __DARWIN_UNIX03
+#ifdef MAC_OS_X_VERSION_10_5
 
 typedef struct __darwin_ucontext darwin_ucontext;
 typedef struct __darwin_mcontext64 darwin_mcontext;

diff --git a/src/runtime/x86-64-darwin-os.h b/src/runtime/x86-64-darwin-os.h
index 4de6bf4..a525908 100644 (file)
--- a/src/runtime/x86-64-darwin-os.h
+++ b/src/runtime/x86-64-darwin-os.h
@@ -10,7 +10,7 @@ static inline os_context_t *arch_os_get_context(void **void_context)
     return (os_context_t *) *void_context;
 }
 
-#if defined __DARWIN_UNIX03
+#ifdef MAC_OS_X_VERSION_10_5
 #define CONTEXT_ADDR_FROM_STEM(stem) &context->uc_mcontext->__ss.__##stem
 #else
 #define CONTEXT_ADDR_FROM_STEM(stem) &context->uc_mcontext->ss.stem

diff --git a/version.lisp-expr b/version.lisp-expr
index 1e67aca..e93ddf1 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.10.36"
+"1.0.10.37"