From 83a06c3d1582cc582ae575a1145edca1432476d9 Mon Sep 17 00:00:00 2001 From: iOS Porting Team Date: Thu, 27 Nov 2014 17:03:04 +0100 Subject: [PATCH] On the iPhone simulator the machine context field has two underscores --- runtime/signals_osdep.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/runtime/signals_osdep.h b/runtime/signals_osdep.h index 6c3023272..5b23bbf93 100644 --- a/runtime/signals_osdep.h +++ b/runtime/signals_osdep.h @@ -47,8 +47,9 @@ #include #include - #if !defined(MAC_OS_X_VERSION_10_5) \ - || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 + #if (!defined(MAC_OS_X_VERSION_10_5) \ + || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) \ + && !defined(__IPHONE_OS_VERSION_MIN_REQUIRED) #define CONTEXT_REG(r) r #else #define CONTEXT_REG(r) __##r @@ -250,8 +251,9 @@ #include #include - #if !defined(MAC_OS_X_VERSION_10_5) \ - || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 + #if (!defined(MAC_OS_X_VERSION_10_5) \ + || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) \ + && !defined(__IPHONE_OS_VERSION_MIN_REQUIRED) #define CONTEXT_REG(r) r #else #define CONTEXT_REG(r) __##r