From f685bc8c1b5993cc16be0330613bb5ec5b9b53e7 Mon Sep 17 00:00:00 2001 From: Dave Lee Date: Tue, 11 Oct 2016 10:20:46 -0700 Subject: [PATCH] Use #include over #import in C souce This is because Clang's MSVC compatibility does not handle #import statements outside of of objc. #import of type library is an unsupported Microsoft feature See also https://github.com/apple/swift-corelibs-foundation/pull/663 --- CoreFoundation/Base.subproj/CFPlatform.c | 2 +- CoreFoundation/Collections.subproj/CFBasicHash.c | 10 +++++----- CoreFoundation/Collections.subproj/CFData.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subproj/CFPlatform.c index c5d2c62638..2f33920138 100644 --- a/CoreFoundation/Base.subproj/CFPlatform.c +++ b/CoreFoundation/Base.subproj/CFPlatform.c @@ -1308,7 +1308,7 @@ CF_EXPORT int32_t _CF_SOCK_STREAM() { return SOCK_STREAM; } #endif #if DEPLOYMENT_RUNTIME_SWIFT -#import +#include int _CFOpenFileWithMode(const char *path, int opts, mode_t mode) { return open(path, opts, mode); } diff --git a/CoreFoundation/Collections.subproj/CFBasicHash.c b/CoreFoundation/Collections.subproj/CFBasicHash.c index 0891ae722b..9a876b716b 100644 --- a/CoreFoundation/Collections.subproj/CFBasicHash.c +++ b/CoreFoundation/Collections.subproj/CFBasicHash.c @@ -13,13 +13,13 @@ Responsibility: Christopher Kane */ -#import "CFBasicHash.h" -#import -#import -#import +#include "CFBasicHash.h" +#include +#include +#include #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED #if __HAS_DISPATCH__ -#import +#include #endif #endif diff --git a/CoreFoundation/Collections.subproj/CFData.c b/CoreFoundation/Collections.subproj/CFData.c index 7d4b60a23e..d5b136abb7 100644 --- a/CoreFoundation/Collections.subproj/CFData.c +++ b/CoreFoundation/Collections.subproj/CFData.c @@ -27,7 +27,7 @@ #endif #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI -#import +#include CF_INLINE unsigned long __CFPageSize() { return vm_page_size; } #elif DEPLOYMENT_TARGET_WINDOWS CF_INLINE unsigned long __CFPageSize() {