diff options
author | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2014-02-21 17:30:10 +0000 |
---|---|---|
committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2014-02-21 17:30:10 +0000 |
commit | c1d255be26ea580b559e9946eb48e2adfaa3db9b (patch) | |
tree | 14b2838dd4cd62c80b896c5913aa7c88142a0475 | |
parent | 98dbb9126e1264f45ec637cb8570b3fbdf180258 (diff) |
Fix up some cases of GTM not compiling with -Wundef on.
DELTA=23 (16 added, 0 deleted, 7 changed)
-rw-r--r-- | AddressBook/GTMABAddressBook.m | 2 | ||||
-rw-r--r-- | AddressBook/GTMABAddressBookTest.m | 8 | ||||
-rw-r--r-- | Foundation/GTMRegex.h | 2 | ||||
-rw-r--r-- | GTMDefines.h | 7 | ||||
-rw-r--r-- | UnitTesting/GTMCodeCoverageApp.h | 11 |
5 files changed, 23 insertions, 7 deletions
diff --git a/AddressBook/GTMABAddressBook.m b/AddressBook/GTMABAddressBook.m index f1f971d..2d99205 100644 --- a/AddressBook/GTMABAddressBook.m +++ b/AddressBook/GTMABAddressBook.m @@ -366,7 +366,7 @@ typedef struct { } - (id)valueForProperty:(GTMABPropertyID)property { -#ifdef GTM_IPHONE_SDK +#if GTM_IPHONE_SDK id value = GTMCFAutorelease(ABRecordCopyValue(record_, property)); #else // GTM_IPHONE_SDK id value = GTMCFAutorelease(ABRecordCopyValue(record_, (CFStringRef)property)); diff --git a/AddressBook/GTMABAddressBookTest.m b/AddressBook/GTMABAddressBookTest.m index 0d1a3cd..7711648 100644 --- a/AddressBook/GTMABAddressBookTest.m +++ b/AddressBook/GTMABAddressBookTest.m @@ -247,7 +247,7 @@ static NSString *const kGTMABTestGroupName = @"GTMABAddressBookTestGroupName"; STAssertEqualObjects(string, @"Last", nil); string = [GTMABPerson localizedPropertyName:kGTMABRecordInvalidID]; -#ifdef GTM_IPHONE_SDK +#if GTM_IPHONE_SDK STAssertEqualObjects(string, kGTMABUnknownPropertyName, nil); #else // GTM_IPHONE_SDK STAssertEqualObjects(string, kGTMABRecordInvalidID, nil); @@ -270,7 +270,7 @@ static NSString *const kGTMABTestGroupName = @"GTMABAddressBookTestGroupName"; GTMABImage *image = [[[GTMABImage alloc] initWithContentsOfFile:phonePath] autorelease]; STAssertNotNil(image, nil); -#ifdef GTM_IPHONE_SDK +#if GTM_IPHONE_SDK data = UIImagePNGRepresentation(image); #else // GTM_IPHONE_SDK data = [image TIFFRepresentation]; @@ -285,7 +285,7 @@ static NSString *const kGTMABTestGroupName = @"GTMABAddressBookTestGroupName"; STAssertTrue([person setImage:image], nil); GTMABImage *image2 = [person image]; STAssertNotNil(image2, nil); -#ifdef GTM_IPHONE_SDK +#if GTM_IPHONE_SDK STAssertEqualObjects(UIImagePNGRepresentation(image), UIImagePNGRepresentation(image2), nil); #else // GTM_IPHONE_SDK @@ -599,7 +599,7 @@ static NSString *const kGTMABTestGroupName = @"GTMABAddressBookTestGroupName"; }; for (size_t j = 0; j < sizeof(types) / sizeof(ABPropertyType); ++j) { ABPropertyType type = types[j]; -#ifdef GTM_IPHONE_SDK +#if GTM_IPHONE_SDK ABMultiValueRef ref = ABMultiValueCreateMutable(type); #else // GTM_IPHONE_SDK ABMutableMultiValueRef ref = ABMultiValueCreateMutable(); diff --git a/Foundation/GTMRegex.h b/Foundation/GTMRegex.h index 3ef5604..8cd1023 100644 --- a/Foundation/GTMRegex.h +++ b/Foundation/GTMRegex.h @@ -56,7 +56,7 @@ typedef NSUInteger GTMRegexOptions; #undef _EXTERN #undef _INITIALIZE_AS -#ifdef GTMREGEX_DEFINE_GLOBALS +#if GTMREGEX_DEFINE_GLOBALS #define _EXTERN #define _INITIALIZE_AS(x) =x #else diff --git a/GTMDefines.h b/GTMDefines.h index db7a04d..1e6fa3f 100644 --- a/GTMDefines.h +++ b/GTMDefines.h @@ -203,9 +203,14 @@ #ifndef GTM_IPHONE_USE_SENTEST #define GTM_IPHONE_USE_SENTEST 0 #endif + #define GTM_MACOS_SDK 0 #else // For MacOS specific stuff #define GTM_MACOS_SDK 1 + #define GTM_IPHONE_SDK 0 + #define GTM_IPHONE_SIMULATOR 0 + #define GTM_IPHONE_DEVICE 0 + #define GTM_IPHONE_USE_SENTEST 0 #endif // Some of our own availability macros @@ -228,7 +233,7 @@ #if !(MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) // NSInteger/NSUInteger and Max/Mins #ifndef NSINTEGER_DEFINED - #if __LP64__ || NS_BUILD_32_LIKE_64 + #if (defined(__LP64__) && __LP64__) || NS_BUILD_32_LIKE_64 typedef long NSInteger; typedef unsigned long NSUInteger; #else diff --git a/UnitTesting/GTMCodeCoverageApp.h b/UnitTesting/GTMCodeCoverageApp.h index 32c92c6..a487d40 100644 --- a/UnitTesting/GTMCodeCoverageApp.h +++ b/UnitTesting/GTMCodeCoverageApp.h @@ -22,8 +22,19 @@ #import <UIKit/UIKit.h> + +// Add GTM_IS_COVERAGE_BUILD to your GCC_PREPROCESSOR_DEFINITIONS for the +// Xcode Configuration that wants CodeCoverage support. +#ifndef GTM_IS_COVERAGE_BUILD +#define GTM_IS_COVERAGE_BUILD 0 +#endif + // If you are using this with XCTest (as opposed to SenTestingKit) // make sure to define GTM_USING_XCTEST. +#ifndef GTM_USING_XCTEST +#define GTM_USING_XCTEST 0 +#endif + #define GTMXCTestObserverClassKey @"XCTestObserverClass" #define GTMXCTestLogClass @"XCTestLog" |