From 3b079d8c56bfe47f35e074a2f390b354e805ef3d Mon Sep 17 00:00:00 2001 From: "gtm.daemon" Date: Mon, 17 Sep 2012 18:30:09 +0000 Subject: [Author: craigwilkinson] Allow GTMStackTraceFromException for iOS >= 2.0 R=dmaclach APPROVED=dmaclach DELTA=5 (3 added, 0 deleted, 2 changed) --- Foundation/GTMStackTrace.h | 3 ++- Foundation/GTMStackTrace.m | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'Foundation') diff --git a/Foundation/GTMStackTrace.h b/Foundation/GTMStackTrace.h index 6574ab8..eb86a66 100644 --- a/Foundation/GTMStackTrace.h +++ b/Foundation/GTMStackTrace.h @@ -53,7 +53,8 @@ struct GTMAddressDescriptor { NSString *GTMStackTrace(void); -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 || \ + __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_2_0 // Returns a string containing a nicely formatted stack trace from the // exception. Only available on 10.5 or later, uses // -[NSException callStackReturnAddresses]. diff --git a/Foundation/GTMStackTrace.m b/Foundation/GTMStackTrace.m index f97c4e0..160ac10 100644 --- a/Foundation/GTMStackTrace.m +++ b/Foundation/GTMStackTrace.m @@ -349,7 +349,8 @@ NSString *GTMStackTrace(void) { return result; } -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 || \ +__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_2_0 NSString *GTMStackTraceFromException(NSException *e) { NSString *trace = @""; @@ -381,3 +382,4 @@ NSString *GTMStackTraceFromException(NSException *e) { } #endif // MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 + //__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_2_0 -- cgit v1.2.3