diff options
| author |  gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2012-09-17 18:30:09 +0000 |
|---|---|---|
| committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2012-09-17 18:30:09 +0000 |
| commit | 3b079d8c56bfe47f35e074a2f390b354e805ef3d (patch) | |
| tree | fb3458cbb74c95c89d590335c5836e4c592f8876 /Foundation | |
| parent | 6285bcd8f21e7f9080208e2cd0c129c1d31fa6a4 (diff) | |
[Author: craigwilkinson]
Allow GTMStackTraceFromException for iOS >= 2.0
R=dmaclach
APPROVED=dmaclach
DELTA=5 (3 added, 0 deleted, 2 changed)
Diffstat (limited to 'Foundation')
| -rw-r--r-- | Foundation/GTMStackTrace.h | 3 | ||||
| -rw-r--r-- | Foundation/GTMStackTrace.m | 4 |
2 files changed, 5 insertions, 2 deletions
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 |