From 18a22e950b490011aac1ecce4b5d8a86d333fd00 Mon Sep 17 00:00:00 2001 From: Cyrus Harmon Date: Sat, 3 Nov 2007 08:54:31 +0000 Subject: [PATCH] 1.0.11.5: update tests for newer macos version * use MAC_OS_X_VERSION_10_5 instead of __DARWIN_UNIX03 --- src/runtime/x86-darwin-os.c | 6 +++--- src/runtime/x86-darwin-os.h | 8 ++++---- version.lisp-expr | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/runtime/x86-darwin-os.c b/src/runtime/x86-darwin-os.c index 4983871..1650517 100644 --- a/src/runtime/x86-darwin-os.c +++ b/src/runtime/x86-darwin-os.c @@ -254,14 +254,14 @@ void signal_emulation_wrapper(x86_thread_state32_t *thread_state, */ os_context_t *context; -#if __DARWIN_UNIX03 +#if MAC_OS_X_VERSION_10_5 struct __darwin_mcontext32 *regs; #else struct mcontext *regs; #endif context = (os_context_t*) os_validate(0, sizeof(os_context_t)); -#if __DARWIN_UNIX03 +#if MAC_OS_X_VERSION_10_5 regs = (struct __darwin_mcontext32*) os_validate(0, sizeof(struct __darwin_mcontext32)); #else regs = (struct mcontext*) os_validate(0, sizeof(struct mcontext)); @@ -285,7 +285,7 @@ void signal_emulation_wrapper(x86_thread_state32_t *thread_state, update_thread_state_from_context(thread_state, float_state, context); os_invalidate((os_vm_address_t)context, sizeof(os_context_t)); -#if __DARWIN_UNIX03 +#if MAC_OS_X_VERSION_10_5 os_invalidate((os_vm_address_t)regs, sizeof(struct __darwin_mcontext32)); #else os_invalidate((os_vm_address_t)regs, sizeof(struct mcontext)); diff --git a/src/runtime/x86-darwin-os.h b/src/runtime/x86-darwin-os.h index 79dea31..4ad51e3 100644 --- a/src/runtime/x86-darwin-os.h +++ b/src/runtime/x86-darwin-os.h @@ -20,10 +20,10 @@ void set_data_desc_addr(data_desc_t* desc, void* addr); /* As of XCode 3.0, the field names for the thread state have changed * and now are prepended with __. Use some #define hackery to deal - * with this. __DARWIN_UNIX03 seems to be a good test to see if we - * need the new style field names. + * with this. MAC_OS_X_VERSION_10_5 seems to be a good test to see if + * we need the new style field names. */ -#if __DARWIN_UNIX03 +#if MAC_OS_X_VERSION_10_5 #define CONTEXT_ADDR_FROM_STEM(stem) &context->uc_mcontext->__ss.__##stem #define EIP __eip @@ -63,7 +63,7 @@ void set_data_desc_addr(data_desc_t* desc, void* addr); #define SS ss #define GS gs -#endif /* __DARWIN_UNIX03 */ +#endif /* MAC_OS_X_VERSION_10_5 */ diff --git a/version.lisp-expr b/version.lisp-expr index b39bc2d..c5ca855 100644 --- 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.11.4" +"1.0.11.5" -- 1.7.10.4