pulling in upstream changes

cjmartin · Sep 24, 2010 · 044190b · 044190b
2 parents e513527 + 0a52f59
commit 044190b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/Examples/SnapAndRun-iPhone/SnapAndRun.xcodeproj/project.pbxproj b/Examples/SnapAndRun-iPhone/SnapAndRun.xcodeproj/project.pbxproj
@@ -270,8 +270,9 @@
 					../../Source,
 				);
 				INFOPLIST_FILE = "SnapAndRun-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
 				PRODUCT_NAME = SnapAndRun;
-				SDKROOT = iphoneos4.1;
+				SDKROOT = iphoneos4.0;
 			};
 			name = Debug;
 		};
@@ -287,8 +288,9 @@
 					../../Source,
 				);
 				INFOPLIST_FILE = "SnapAndRun-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
 				PRODUCT_NAME = SnapAndRun;
-				SDKROOT = iphoneos4.1;
+				SDKROOT = iphoneos4.0;
 			};
 			name = Release;
 		};
@@ -302,7 +304,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = iphoneos4.1;
+				SDKROOT = iphoneos2.2;
 			};
 			name = Debug;
 		};
@@ -315,7 +317,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
-				SDKROOT = iphoneos4.1;
+				SDKROOT = iphoneos2.2;
 			};
 			name = Release;
 		};

diff --git a/ObjectiveFlickr.xcodeproj/project.pbxproj b/ObjectiveFlickr.xcodeproj/project.pbxproj
@@ -334,6 +334,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = ObjectiveFlickr;
+				RUN_CLANG_STATIC_ANALYZER = NO;
 			};
 			name = Debug;
 		};
@@ -361,6 +362,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = ObjectiveFlickr;
+				RUN_CLANG_STATIC_ANALYZER = NO;
 			};
 			name = Release;
 		};
@@ -449,27 +451,26 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
 				PRODUCT_NAME = ObjectiveFlickr;
-				SDKROOT = iphoneos4.1;
+				RUN_CLANG_STATIC_ANALYZER = NO;
 			};
 			name = Debug;
 		};
 		6ABF72E90F939BE700B9179E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				PREBINDING = NO;
 				PRODUCT_NAME = ObjectiveFlickr;
-				SDKROOT = iphoneos4.1;
+				RUN_CLANG_STATIC_ANALYZER = NO;
 				ZERO_LINK = NO;
 			};
 			name = Release;

diff --git a/Source/OFXMLMapper.h b/Source/OFXMLMapper.h
@@ -29,7 +29,7 @@
 
 extern NSString *const OFXMLTextContentKey;
 
-#if MAC_OS_X_VERSION_10_6 && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
+#if (MAC_OS_X_VERSION_10_6 && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6) || (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_2_0)
 @interface OFXMLMapper : NSObject <NSXMLParserDelegate>
 #else
 @interface OFXMLMapper : NSObject