Ben Copsey

Fix for Mac

@@ -3003,7 +3003,11 @@ static BOOL isiPhoneOS2; @@ -3003,7 +3003,11 @@ static BOOL isiPhoneOS2;
3003 } 3003 }
3004 3004
3005 // Are we performing bandwidth throttling? 3005 // Are we performing bandwidth throttling?
  3006 +#if TARGET_OS_IPHONE
3006 if (isBandwidthThrottled || (!shouldThrottleBandwithForWWANOnly && (maxBandwidthPerSecond))) { 3007 if (isBandwidthThrottled || (!shouldThrottleBandwithForWWANOnly && (maxBandwidthPerSecond))) {
  3008 +#else
  3009 + if (maxBandwidthPerSecond) {
  3010 +#endif
3007 // How much data can we still send or receive this second? 3011 // How much data can we still send or receive this second?
3008 long long bytesRemaining = (long long)maxBandwidthPerSecond - (long long)bandwidthUsedInLastSecond; 3012 long long bytesRemaining = (long long)maxBandwidthPerSecond - (long long)bandwidthUsedInLastSecond;
3009 3013
@@ -18,6 +18,8 @@ There are two versions of Apple's Reachability class, both of which are included @@ -18,6 +18,8 @@ There are two versions of Apple's Reachability class, both of which are included
18 18
19 * Version 1.5 is the old version, but it is compatible with both iPhone OS 2.2.1 and iPhone OS 3.0 and later. You should use this if your application needs to work on iPhone OS 2.2.1. 19 * Version 1.5 is the old version, but it is compatible with both iPhone OS 2.2.1 and iPhone OS 3.0 and later. You should use this if your application needs to work on iPhone OS 2.2.1.
20 To use Version 1.5, set this to 0, and include Reachbility.h + Reachbility.m from the Reachability 1.5 folder in your project 20 To use Version 1.5, set this to 0, and include Reachbility.h + Reachbility.m from the Reachability 1.5 folder in your project
  21 +
  22 +This config option is not used for apps targeting Mac OS X
21 */ 23 */
22 24
23 #define REACHABILITY_20_API 0 25 #define REACHABILITY_20_API 0
@@ -55,5 +55,7 @@ @@ -55,5 +55,7 @@
55 - (void)delegateTestStarted:(ASIHTTPRequest *)request; 55 - (void)delegateTestStarted:(ASIHTTPRequest *)request;
56 - (void)delegateTestFinished:(ASIHTTPRequest *)request; 56 - (void)delegateTestFinished:(ASIHTTPRequest *)request;
57 - (void)delegateTestFailed:(ASIHTTPRequest *)request; 57 - (void)delegateTestFailed:(ASIHTTPRequest *)request;
  58 +#if TARGET_OS_IPHONE
58 - (void)testReachability; 59 - (void)testReachability;
  60 +#endif
59 @end 61 @end
@@ -1214,6 +1214,7 @@ @@ -1214,6 +1214,7 @@
1214 progress = newProgress; 1214 progress = newProgress;
1215 } 1215 }
1216 1216
  1217 +#if TARGET_OS_IPHONE
1217 - (void)testReachability 1218 - (void)testReachability
1218 { 1219 {
1219 #if REACHABILITY_20_API 1220 #if REACHABILITY_20_API
@@ -1227,5 +1228,5 @@ @@ -1227,5 +1228,5 @@
1227 NSLog(@"Not connected via WWAN"); 1228 NSLog(@"Not connected via WWAN");
1228 } 1229 }
1229 } 1230 }
1230 - 1231 +#endif
1231 @end 1232 @end
This diff was suppressed by a .gitattributes entry.