Inverted preprocessor logic to check iff version exists in target

ElfSundae · Jun 29, 2018 · ca380fd · ca380fd
1 parent 54f1135
commit ca380fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/AFNetworking/AFCompatibilityMacros.h b/AFNetworking/AFCompatibilityMacros.h
@@ -34,10 +34,10 @@
     #define AF_CAN_USE_AT_AVAILABLE 0
 #endif
 
-#if (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 || __MAC_OS_VERSION_MAX_ALLOWED >= __MAC_OS_10_12 || __WATCH_OS_MAX_VERSION_ALLOWED >= __WATCH_OS_3_0 || __TV_OS_MAX_VERSION_ALLOWED >= __TV_OS_10_0)
-    #define AF_CAN_INCLUDE_SESSION_TASK_METRICS 1
-#else
+#if ((__IPHONE_OS_VERSION_MAX_ALLOWED && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_10_0) || (__MAC_OS_VERSION_MAX_ALLOWED && __MAC_OS_VERSION_MAX_ALLOWED < __MAC_OS_10_12) ||(__WATCH_OS_MAX_VERSION_ALLOWED && __WATCH_OS_MAX_VERSION_ALLOWED < __WATCH_OS_3_0) ||(__TV_OS_MAX_VERSION_ALLOWED && __TV_OS_MAX_VERSION_ALLOWED < __TV_OS_10_0))
     #define AF_CAN_INCLUDE_SESSION_TASK_METRICS 0
+#else
+    #define AF_CAN_INCLUDE_SESSION_TASK_METRICS 1
 #endif
 
 #endif /* AFCompatibilityMacros_h */
diff --git a/Tests/Tests/AFURLSessionManagerTests.m b/Tests/Tests/AFURLSessionManagerTests.m
@@ -135,7 +135,7 @@ - (void)testDownloadTaskDoesReportProgress {
 
 - (void)testSessionTaskDoesReportMetrics {
     [self expectationForNotification:AFNetworkingTaskDidCompleteNotification object:nil handler:^BOOL(NSNotification * _Nonnull notification) {
-#if AF_CAN_USE_AT_AVAILABLE
+#if AF_CAN_USE_AT_AVAILABLE && AF_CAN_INCLUDE_SESSION_TASK_METRICS
         if (@available(iOS 10, macOS 10.12, watchOS 3, tvOS 10, *)) {
             return [notification userInfo][AFNetworkingTaskDidCompleteSessionTaskMetrics] != nil;
         }