Merge pull request #2653 from 3405691582/CFBase_AlwaysIncludeCoreFoundationTargetConditionals

[CF] Simplify including TargetConditionals.h.

Author: compnerd

CoreFoundation/Base.subproj/CFAvailability.h

@@ -10,13 +10,7 @@
 #if !defined(__COREFOUNDATION_CFAVAILABILITY__)
 #define __COREFOUNDATION_CFAVAILABILITY__ 1
 
-#if __has_include(<CoreFoundation/TargetConditionals.h>)
 #include <CoreFoundation/TargetConditionals.h>
-#elif __has_include(<TargetConditionals.h>)
-#include <TargetConditionals.h>
-#else
-#error Missing header TargetConditionals.h
-#endif
 
 #if __has_include(<Availability.h>) && __has_include(<os/availability.h>) && __has_include(<AvailabilityMacros.h>)
 #include <Availability.h>

CoreFoundation/Base.subproj/CFBase.h

@@ -10,11 +10,7 @@
 #if !defined(__COREFOUNDATION_CFBASE__)
 #define __COREFOUNDATION_CFBASE__ 1
 
-#if DEPLOYMENT_RUNTIME_SWIFT
 #include <CoreFoundation/TargetConditionals.h>
-#else
-#include <TargetConditionals.h>
-#endif
 #include <CoreFoundation/CFAvailability.h>
 
 #if (defined(__CYGWIN32__) || defined(_WIN32)) && !defined(__WIN32__)