Tweaks to conditional compilation for iOS4

@@ -188,10 +188,10 @@ NSLock *dialogLock = nil;
 
 - (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
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_0
 	UITableViewCell *cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:nil] autorelease];
+#else
+	UITableViewCell *cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:nil] autorelease];
 #endif
 
 	[cell setSelectionStyle:UITableViewCellSelectionStyleNone];

@@ -21,11 +21,20 @@
 
 extern NSString *ASIHTTPRequestVersion;
 
-// Make targeting 2.2.1 more reliable
+// Make targeting different platforms 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
+#ifndef __IPHONE_4_0
+	#define __IPHONE_4_0 40000
+#endif
+#ifndef __MAC_10_5
+	#define __MAC_10_5 1050
+#endif
+#ifndef __MAC_10_6
+	#define __MAC_10_6 1060
+#endif
 
 typedef enum _ASIAuthenticationState {
 	ASINoAuthenticationNeededYet = 0,

@@ -23,7 +23,7 @@
 
 
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.6.2-14 2010-06-04";
+NSString *ASIHTTPRequestVersion = @"v1.6.2-15 2010-06-15";
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
@@ -851,7 +851,6 @@ static BOOL isiPhoneOS2;
 	// Handle proxy settings
 	//
 	
-	
 	// Have details of the proxy been set on this request
 	if (![self proxyHost] && ![self proxyPort]) {
 		
@@ -3523,10 +3522,10 @@ static BOOL isiPhoneOS2;
 			// Yes, put this request to sleep until a second is up, with extra added punishment sleeping time for being very naughty (we have used more bandwidth than we were allowed)
 			double extraSleepyTime = (-bytesRemaining/(maxBandwidthPerSecond*1.0));
 			[throttleWakeUpTime release];
-			#if (TARGET_OS_IPHONE && (!defined(__IPHONE_4_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_4_0)) || !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
-			throttleWakeUpTime = [[bandwidthMeasurementDate addTimeInterval:extraSleepyTime] retain];
-			#else
+			#if (!TARGET_OS_IPHONE && MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_6) || (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_4_0)
 			throttleWakeUpTime = [[bandwidthMeasurementDate dateByAddingTimeInterval:extraSleepyTime] retain];
+			#else
+			throttleWakeUpTime = [[bandwidthMeasurementDate addTimeInterval:extraSleepyTime] retain];
 			#endif
 		}
 	}

@@ -8,8 +8,7 @@
 
 @class ASICloudFilesContainer;
 
-// Prevent warning about missing NSXMLParserDelegate on Leopard and iPhone
-#if !TARGET_OS_IPHONE && MAC_OS_X_VERSION_10_5 < MAC_OS_X_VERSION_MAX_ALLOWED
+#if (!TARGET_OS_IPHONE && MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_6) || (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_4_0)
 @interface ASICloudFilesContainerXMLParserDelegate : NSObject <NSXMLParserDelegate> {
 #else
 @interface ASICloudFilesContainerXMLParserDelegate : NSObject {

@@ -10,7 +10,7 @@
 
 
 // Prevent warning about missing NSXMLParserDelegate on Leopard and iPhone
-#if !TARGET_OS_IPHONE && MAC_OS_X_VERSION_10_5 < MAC_OS_X_VERSION_MAX_ALLOWED
+#if (!TARGET_OS_IPHONE && MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_6) || (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_4_0)
 @interface ASICloudFilesObjectRequest : ASICloudFilesRequest <NSXMLParserDelegate> {
 #else
 @interface ASICloudFilesObjectRequest : ASICloudFilesRequest {

@@ -23,8 +23,7 @@ typedef enum _ASIS3ErrorType {
 	
 } ASIS3ErrorType;
 
-// Prevent warning about missing NSXMLParserDelegate on Leopard and iPhone
-#if !TARGET_OS_IPHONE && MAC_OS_X_VERSION_10_5 < MAC_OS_X_VERSION_MAX_ALLOWED
+#if (!TARGET_OS_IPHONE && MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_6) || (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_4_0)
 @interface ASIS3Request : ASIHTTPRequest <NSCopying, NSXMLParserDelegate> {
 #else
 @interface ASIS3Request : ASIHTTPRequest <NSCopying> {

- Subproject commit b3fb762df63b46910e56c0681111395ea8f41508
+ Subproject commit 99621b30f837502875d3591479a647193af4c031