Tweak conditional compilation stuff for 2.2.1 to make it more reliable

Fix 2.2.1 problem with ASIAuthenticationDialog - no idea why I didn't catch this before

@@ -188,7 +188,12 @@ NSLock *dialogLock = nil;
 
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
 {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_3_0
+	UITableViewCell *cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:nil] autorelease];
+#else
 	UITableViewCell *cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:nil] autorelease];
 	UITableViewCell *cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:nil] autorelease];
+#endif
+
 	[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
 	[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
 	UITextField *textField = [[[UITextField alloc] initWithFrame:CGRectMake(20,12,260,25)] autorelease];
 	UITextField *textField = [[[UITextField alloc] initWithFrame:CGRectMake(20,12,260,25)] autorelease];
 	[textField setAutocapitalizationType:UITextAutocapitalizationTypeNone];
 	[textField setAutocapitalizationType:UITextAutocapitalizationTypeNone];

@@ -16,6 +16,12 @@
 #endif
 #endif
 #import <stdio.h>
 #import <stdio.h>
 
 
+// Make targeting 2.2.1 more reliable
+// See: http://www.blumtnwerx.com/blog/2009/06/cross-sdk-code-hygiene-in-xcode/
+#ifndef __IPHONE_3_0
+	#define __IPHONE_3_0 30000
+#endif
+
 
 
 typedef enum _ASINetworkErrorType {
 typedef enum _ASINetworkErrorType {
     ASIConnectionFailureErrorType = 1,
     ASIConnectionFailureErrorType = 1,

@@ -602,11 +602,11 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 		} else {
 		} else {
 		
 		
 			#if TARGET_OS_IPHONE
 			#if TARGET_OS_IPHONE
-			#if !defined(TARGET_IPHONE_SIMULATOR) || __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_2_2
-			NSDictionary *proxySettings = [(NSDictionary *)CFNetworkCopySystemProxySettings() autorelease];
-			#else
+			#if TARGET_IPHONE_SIMULATOR && __IPHONE_OS_VERSION_MIN_REQUIRED < IPHONE_3_0
 			// Can't detect proxies in 2.2.1 Simulator
 			// Can't detect proxies in 2.2.1 Simulator
 			NSDictionary *proxySettings = [NSMutableDictionary dictionary];	
 			NSDictionary *proxySettings = [NSMutableDictionary dictionary];	
+			#else
+			NSDictionary *proxySettings = [(NSDictionary *)CFNetworkCopySystemProxySettings() autorelease];
 			#endif
 			#endif
 			#else
 			#else
 			NSDictionary *proxySettings = [(NSDictionary *)SCDynamicStoreCopyProxies(NULL) autorelease];
 			NSDictionary *proxySettings = [(NSDictionary *)SCDynamicStoreCopyProxies(NULL) autorelease];
@@ -2529,14 +2529,14 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 		return nil;
 		return nil;
 	}
 	}
 	// Obtain the list of proxies by running the autoconfiguration script
 	// Obtain the list of proxies by running the autoconfiguration script
-#if !TARGET_OS_IPHONE ||  __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_2_2
+#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < IPHONE_3_0
+	NSArray *proxies = [(NSArray *)CFNetworkCopyProxiesForAutoConfigurationScript((CFStringRef)script,(CFURLRef)theURL) autorelease];
+#else
 	CFErrorRef err2 = NULL;
 	CFErrorRef err2 = NULL;
 	NSArray *proxies = [(NSArray *)CFNetworkCopyProxiesForAutoConfigurationScript((CFStringRef)script,(CFURLRef)theURL, &err2) autorelease];
 	NSArray *proxies = [(NSArray *)CFNetworkCopyProxiesForAutoConfigurationScript((CFStringRef)script,(CFURLRef)theURL, &err2) autorelease];
 	if (err2) {
 	if (err2) {
 		return nil;
 		return nil;
 	}
 	}
-#else
-	NSArray *proxies = [(NSArray *)CFNetworkCopyProxiesForAutoConfigurationScript((CFStringRef)script,(CFURLRef)theURL) autorelease];
 #endif
 #endif
 	return proxies;
 	return proxies;
 }
 }