Skip to content

Commit 7914671

Browse files
parkeraparkera
committed
Ensure we're using the built-in CoreFoundation and not mixing things with the toolchain, by renaming the module
1 parent f501e19 commit 7914671

File tree

124 files changed

+267
-166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+267
-166
lines changed

‎Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 5.10
1+
// swift-tools-version: 5.9
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
@@ -28,7 +28,7 @@ let buildSettings: [CSetting] = [
2828
"-fexceptions", // TODO: not on OpenBSD
2929
"-fdollars-in-identifiers",
3030
"-fno-common",
31-
"-fcf-runtime-abi=swift"
31+
"-fcf-runtime-abi=swift",
3232
// /EHsc for Windows
3333
]),
3434
.unsafeFlags(["-I/usr/lib/swift"], .when(platforms: [.linux, .android])) // dispatch

‎Sources/CoreFoundation/CFBundle.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,15 @@ static void _CFBundleEnsureBundlesExistForImagePaths(CFArrayRef imagePaths);
141141
// Functions and constants for FHS bundles:
142142
#define _CFBundleFHSDirectory_share CFSTR("share")
143143

144-
static Boolean _CFBundleURLIsForFHSInstalledBundle(CFURLRef bundleURL) {
144+
static bool _CFBundleURLIsForFHSInstalledBundle(CFURLRef bundleURL) {
145145
// Paths of this form are FHS installed bundles:
146146
// <anywhere>/share/<name>.resources
147147

148148
CFStringRef extension = CFURLCopyPathExtension(bundleURL);
149149
CFURLRef parentURL = CFURLCreateCopyDeletingLastPathComponent(kCFAllocatorSystemDefault, bundleURL);
150150
CFStringRef containingDirectoryName = parentURL ? CFURLCopyLastPathComponent(parentURL) : NULL;
151151

152-
Boolean isFHSBundle =
152+
bool isFHSBundle =
153153
extension &&
154154
containingDirectoryName &&
155155
CFEqual(extension, _CFBundleSiblingResourceDirectoryExtension) &&
@@ -163,15 +163,15 @@ static Boolean _CFBundleURLIsForFHSInstalledBundle(CFURLRef bundleURL) {
163163
}
164164
#endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID
165165

166-
CF_CROSS_PLATFORM_EXPORT Boolean _CFBundleSupportsFHSBundles() {
166+
CF_CROSS_PLATFORM_EXPORT bool _CFBundleSupportsFHSBundles() {
167167
#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID
168168
return true;
169169
#else
170170
return false;
171171
#endif
172172
}
173173

174-
CF_CROSS_PLATFORM_EXPORT Boolean _CFBundleSupportsFreestandingBundles() {
174+
CF_CROSS_PLATFORM_EXPORT bool _CFBundleSupportsFreestandingBundles() {
175175
#if !DEPLOYMENT_RUNTIME_OBJC
176176
return true;
177177
#else

‎Sources/CoreFoundation/CFCalendar.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "CFRuntime_Internal.h"
1515
#include "CFPriv.h"
1616
#include "CFCalendar_Internal.h"
17-
#include "CFLocaleInternal.h"
17+
#include "CFConstantKeys.h"
1818
#include "CFICULogging.h"
1919
#include "CFDateInterval.h"
2020
#include <assert.h>

‎Sources/CoreFoundation/CFCalendar_Enumerate.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "CFCalendar.h"
1212
#include "CFCalendar_Internal.h"
1313
#include "CFDateComponents.h"
14-
#include "CFLocaleInternal.h"
14+
#include "CFConstantKeys.h"
1515
#include "CFInternal.h"
1616

1717
CF_PRIVATE CFDateRef _CFDateCreateWithTimeIntervalSinceDate(CFAllocatorRef allocator, CFTimeInterval ti, CFDateRef date) {

‎Sources/CoreFoundation/CFDateFormatter.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "CFPriv.h"
2020
#include "CFInternal.h"
2121
#include "CFRuntime_Internal.h"
22-
#include "CFLocaleInternal.h"
22+
#include "CFConstantKeys.h"
2323
#include "CFICULogging.h"
2424
#include <math.h>
2525
#include <float.h>

‎Sources/CoreFoundation/CFLocale.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#else
2626
#include "CFBase.h"
2727
#endif
28-
#include "CFLocaleInternal.h"
28+
#include "CFConstantKeys.h"
2929
#include <stdatomic.h>
3030
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_BSD
3131
#include <unicode/uloc.h> // ICU locales

‎Sources/CoreFoundation/CFLocaleIdentifier.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
#define ULOC_KEYWORD_AND_VALUES_CAPACITY 100
6767
#endif
6868
#include "CFInternal.h"
69-
#include "CFLocaleInternal.h"
69+
#include "CFConstantKeys.h"
7070

7171
// Max byte length of locale identifier (ASCII) as C string, including terminating null byte
7272
enum {

‎Sources/CoreFoundation/CFNumberFormatter.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "CFBigNumber.h"
1515
#include "CFInternal.h"
1616
#include "CFRuntime_Internal.h"
17-
#include "CFLocaleInternal.h"
17+
#include "CFConstantKeys.h"
1818
#include "CFICULogging.h"
1919
#include <math.h>
2020
#include <float.h>

‎Sources/CoreFoundation/CFPropertyList.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "CFStream.h"
2929
#endif
3030
#include "CFCalendar.h"
31-
#include "CFLocaleInternal.h"
31+
#include "CFConstantKeys.h"
3232
#include <limits.h>
3333
#include <float.h>
3434
#include <string.h>

‎Sources/CoreFoundation/CFString.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <assert.h>
3030
#include <unicode/uchar.h>
3131
#if TARGET_OS_MAC || TARGET_OS_WIN32 || TARGET_OS_LINUX || TARGET_OS_BSD
32-
#include "CFLocaleInternal.h"
32+
#include "CFConstantKeys.h"
3333
#include "CFStringLocalizedFormattingInternal.h"
3434
#endif
3535
#include <stdarg.h>
@@ -7932,4 +7932,3 @@ void CFShowStr(CFStringRef str) {
79327932
#undef HANGUL_VCOUNT
79337933
#undef HANGUL_TCOUNT
79347934
#undef HANGUL_NCOUNT
7935-

‎Sources/CoreFoundation/CFURL.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4396,7 +4396,7 @@ CF_EXPORT CFURLRef CFURLCreateWithFileSystemPathRelativeToBase(CFAllocatorRef al
43964396
return ( result );
43974397
}
43984398

4399-
void _CFURLInitWithFileSystemPathRelativeToBase(CFURLRef url, CFStringRef fileSystemPath, CFURLPathStyle pathStyle, Boolean isDirectory, _Nullable CFURLRef baseURL) {
4399+
void _CFURLInitWithFileSystemPathRelativeToBase(CFURLRef url, CFStringRef fileSystemPath, CFURLPathStyle pathStyle, bool isDirectory, _Nullable CFURLRef baseURL) {
44004400
CFAllocatorRef allocator = kCFAllocatorSystemDefault;
44014401
struct __CFURL *result = (struct __CFURL *)CFURLCreateWithFileSystemPathRelativeToBase(allocator, fileSystemPath, pathStyle, isDirectory, baseURL);
44024402
if (result == NULL) return;

‎Sources/CoreFoundation/CFUtilities.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "CFBase.h"
1818
#include "CFPriv.h"
1919
#include "CFInternal.h"
20-
#include "CFLocaleInternal.h"
20+
#include "CFConstantKeys.h"
2121
#if !TARGET_OS_WASI
2222
#include "CFBundle_Internal.h"
2323
#endif

‎Sources/CoreFoundation/include/CFAvailability.h

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
88
*/
99

10+
#ifndef DEPLOYMENT_RUNTIME_SWIFT
11+
#define DEPLOYMENT_RUNTIME_SWIFT 1
12+
#endif
13+
1014
#if !defined(__COREFOUNDATION_CFAVAILABILITY__)
1115
#define __COREFOUNDATION_CFAVAILABILITY__ 1
1216

‎Sources/CoreFoundation/include/CFBase.h

-4
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,7 @@
7777

7878
#if !defined(__MACTYPES__)
7979
#if !defined(_OS_OSTYPES_H)
80-
#if DEPLOYMENT_RUNTIME_SWIFT
8180
typedef bool Boolean;
82-
#else
83-
typedef unsigned char Boolean;
84-
#endif
8581
typedef unsigned char UInt8;
8682
typedef signed char SInt8;
8783
typedef unsigned short UInt16;

‎Sources/CoreFoundation/include/CFCalendarPriv.h

+7
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ CF_EXPORT Boolean _CFCalendarAddComponentsV(CFCalendarRef calendar, /* inout */
3737
CF_EXPORT Boolean _CFCalendarGetComponentDifferenceV(CFCalendarRef calendar, CFAbsoluteTime startingAT, CFAbsoluteTime resultAT, CFOptionFlags options, const char *componentDesc, int32_t *_Nonnull * _Nonnull vector, int32_t count);
3838
CF_EXPORT void _CFCalendarEnumerateDates(CFCalendarRef calendar, CFDateRef start, CFDateComponentsRef matchingComponents, CFOptionFlags opts, void (^block)(CFDateRef _Nullable, Boolean, Boolean*));
3939

40+
CF_EXPORT Boolean _CFCalendarIsDateInWeekend(CFCalendarRef calendar, CFDateRef date);
41+
CF_EXPORT Boolean _CFCalendarGetNextWeekend(CFCalendarRef calendar, _CFCalendarWeekendRange *range);
42+
43+
CF_EXPORT void _CFCalendarEnumerateDates(CFCalendarRef calendar, CFDateRef start, CFDateComponentsRef matchingComponents, CFOptionFlags opts, void (^block)(CFDateRef _Nullable, Boolean, Boolean*));
44+
CF_EXPORT void CFCalendarSetGregorianStartDate(CFCalendarRef calendar, CFDateRef _Nullable date);
45+
CF_EXPORT _Nullable CFDateRef CFCalendarCopyGregorianStartDate(CFCalendarRef calendar);
46+
4047
CF_ASSUME_NONNULL_END
4148
CF_EXTERN_C_END
4249
CF_IMPLICIT_BRIDGING_DISABLED

‎Sources/CoreFoundation/include/CFConstantKeys.h

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
/*
2+
CFConstantKeys.h
3+
Copyright (c) 2008-2019, Apple Inc. and the Swift project authors
4+
5+
Portions Copyright (c) 2014-2019, Apple Inc. and the Swift project authors
6+
Licensed under Apache License v2.0 with Runtime Library Exception
7+
See http://swift.org/LICENSE.txt for license information
8+
See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
9+
*/
10+
11+
/*
12+
This file is for the use of the CoreFoundation project only.
13+
*/
14+
15+
#include "CFString.h"
16+
17+
CF_EXPORT CFStringRef const kCFLocaleAlternateQuotationBeginDelimiterKey;
18+
CF_EXPORT CFStringRef const kCFLocaleAlternateQuotationEndDelimiterKey;
19+
CF_EXPORT CFStringRef const kCFLocaleQuotationBeginDelimiterKey;
20+
CF_EXPORT CFStringRef const kCFLocaleQuotationEndDelimiterKey;
21+
CF_EXPORT CFStringRef const kCFLocaleCalendarIdentifierKey; // ***
22+
CF_EXPORT CFStringRef const kCFLocaleCalendarKey;
23+
CF_EXPORT CFStringRef const kCFLocaleCollationIdentifierKey; // ***
24+
CF_EXPORT CFStringRef const kCFLocaleCollatorIdentifierKey;
25+
CF_EXPORT CFStringRef const kCFLocaleCountryCodeKey;
26+
CF_EXPORT CFStringRef const kCFLocaleCurrencyCodeKey; // ***
27+
CF_EXPORT CFStringRef const kCFLocaleCurrencySymbolKey;
28+
CF_EXPORT CFStringRef const kCFLocaleDecimalSeparatorKey;
29+
CF_EXPORT CFStringRef const kCFLocaleExemplarCharacterSetKey;
30+
CF_EXPORT CFStringRef const kCFLocaleGroupingSeparatorKey;
31+
CF_EXPORT CFStringRef const kCFLocaleIdentifierKey;
32+
CF_EXPORT CFStringRef const kCFLocaleLanguageCodeKey;
33+
CF_EXPORT CFStringRef const kCFLocaleMeasurementSystemKey;
34+
CF_EXPORT CFStringRef const kCFLocaleTemperatureUnitKey;
35+
CF_EXPORT CFStringRef const kCFLocaleScriptCodeKey;
36+
CF_EXPORT CFStringRef const kCFLocaleUsesMetricSystemKey;
37+
CF_EXPORT CFStringRef const kCFLocaleVariantCodeKey;
38+
39+
CF_EXPORT CFStringRef const kCFDateFormatterAMSymbolKey;
40+
CF_EXPORT CFStringRef const kCFDateFormatterCalendarKey;
41+
CF_EXPORT CFStringRef const kCFDateFormatterCalendarIdentifierKey;
42+
CF_EXPORT CFStringRef const kCFDateFormatterDefaultDateKey;
43+
CF_EXPORT CFStringRef const kCFDateFormatterDefaultFormatKey;
44+
CF_EXPORT CFStringRef const kCFDateFormatterDoesRelativeDateFormattingKey;
45+
CF_EXPORT CFStringRef const kCFDateFormatterEraSymbolsKey;
46+
CF_EXPORT CFStringRef const kCFDateFormatterGregorianStartDateKey;
47+
CF_EXPORT CFStringRef const kCFDateFormatterIsLenientKey;
48+
CF_EXPORT CFStringRef const kCFDateFormatterLongEraSymbolsKey;
49+
CF_EXPORT CFStringRef const kCFDateFormatterMonthSymbolsKey;
50+
CF_EXPORT CFStringRef const kCFDateFormatterPMSymbolKey;
51+
CF_EXPORT CFStringRef const kCFDateFormatterAmbiguousYearStrategyKey;
52+
CF_EXPORT CFStringRef const kCFDateFormatterQuarterSymbolsKey;
53+
CF_EXPORT CFStringRef const kCFDateFormatterShortMonthSymbolsKey;
54+
CF_EXPORT CFStringRef const kCFDateFormatterShortQuarterSymbolsKey;
55+
CF_EXPORT CFStringRef const kCFDateFormatterShortStandaloneMonthSymbolsKey;
56+
CF_EXPORT CFStringRef const kCFDateFormatterShortStandaloneQuarterSymbolsKey;
57+
CF_EXPORT CFStringRef const kCFDateFormatterShortStandaloneWeekdaySymbolsKey;
58+
CF_EXPORT CFStringRef const kCFDateFormatterShortWeekdaySymbolsKey;
59+
CF_EXPORT CFStringRef const kCFDateFormatterStandaloneMonthSymbolsKey;
60+
CF_EXPORT CFStringRef const kCFDateFormatterStandaloneQuarterSymbolsKey;
61+
CF_EXPORT CFStringRef const kCFDateFormatterStandaloneWeekdaySymbolsKey;
62+
CF_EXPORT CFStringRef const kCFDateFormatterTimeZoneKey;
63+
CF_EXPORT CFStringRef const kCFDateFormatterTwoDigitStartDateKey;
64+
CF_EXPORT CFStringRef const kCFDateFormatterVeryShortMonthSymbolsKey;
65+
CF_EXPORT CFStringRef const kCFDateFormatterVeryShortStandaloneMonthSymbolsKey;
66+
CF_EXPORT CFStringRef const kCFDateFormatterVeryShortStandaloneWeekdaySymbolsKey;
67+
CF_EXPORT CFStringRef const kCFDateFormatterVeryShortWeekdaySymbolsKey;
68+
CF_EXPORT CFStringRef const kCFDateFormatterWeekdaySymbolsKey;
69+
CF_EXPORT CFStringRef const kCFDateFormatterUsesCharacterDirectionKey;
70+
71+
CF_EXPORT CFStringRef const kCFNumberFormatterAlwaysShowDecimalSeparatorKey;
72+
CF_EXPORT CFStringRef const kCFNumberFormatterCurrencyCodeKey;
73+
CF_EXPORT CFStringRef const kCFNumberFormatterCurrencyDecimalSeparatorKey;
74+
CF_EXPORT CFStringRef const kCFNumberFormatterCurrencyGroupingSeparatorKey;
75+
CF_EXPORT CFStringRef const kCFNumberFormatterCurrencySymbolKey;
76+
CF_EXPORT CFStringRef const kCFNumberFormatterDecimalSeparatorKey;
77+
CF_EXPORT CFStringRef const kCFNumberFormatterDefaultFormatKey;
78+
CF_EXPORT CFStringRef const kCFNumberFormatterExponentSymbolKey;
79+
CF_EXPORT CFStringRef const kCFNumberFormatterFormatWidthKey;
80+
CF_EXPORT CFStringRef const kCFNumberFormatterGroupingSeparatorKey;
81+
CF_EXPORT CFStringRef const kCFNumberFormatterGroupingSizeKey;
82+
CF_EXPORT CFStringRef const kCFNumberFormatterInfinitySymbolKey;
83+
CF_EXPORT CFStringRef const kCFNumberFormatterInternationalCurrencySymbolKey;
84+
CF_EXPORT CFStringRef const kCFNumberFormatterIsLenientKey;
85+
CF_EXPORT CFStringRef const kCFNumberFormatterMaxFractionDigitsKey;
86+
CF_EXPORT CFStringRef const kCFNumberFormatterMaxIntegerDigitsKey;
87+
CF_EXPORT CFStringRef const kCFNumberFormatterMaxSignificantDigitsKey;
88+
CF_EXPORT CFStringRef const kCFNumberFormatterMinFractionDigitsKey;
89+
CF_EXPORT CFStringRef const kCFNumberFormatterMinIntegerDigitsKey;
90+
CF_EXPORT CFStringRef const kCFNumberFormatterMinSignificantDigitsKey;
91+
CF_EXPORT CFStringRef const kCFNumberFormatterMinusSignKey;
92+
CF_EXPORT CFStringRef const kCFNumberFormatterMultiplierKey;
93+
CF_EXPORT CFStringRef const kCFNumberFormatterNaNSymbolKey;
94+
CF_EXPORT CFStringRef const kCFNumberFormatterNegativePrefixKey;
95+
CF_EXPORT CFStringRef const kCFNumberFormatterNegativeSuffixKey;
96+
CF_EXPORT CFStringRef const kCFNumberFormatterPaddingCharacterKey;
97+
CF_EXPORT CFStringRef const kCFNumberFormatterPaddingPositionKey;
98+
CF_EXPORT CFStringRef const kCFNumberFormatterPerMillSymbolKey;
99+
CF_EXPORT CFStringRef const kCFNumberFormatterPercentSymbolKey;
100+
CF_EXPORT CFStringRef const kCFNumberFormatterPlusSignKey;
101+
CF_EXPORT CFStringRef const kCFNumberFormatterPositivePrefixKey;
102+
CF_EXPORT CFStringRef const kCFNumberFormatterPositiveSuffixKey;
103+
CF_EXPORT CFStringRef const kCFNumberFormatterRoundingIncrementKey;
104+
CF_EXPORT CFStringRef const kCFNumberFormatterRoundingModeKey;
105+
CF_EXPORT CFStringRef const kCFNumberFormatterSecondaryGroupingSizeKey;
106+
CF_EXPORT CFStringRef const kCFNumberFormatterUseGroupingSeparatorKey;
107+
CF_EXPORT CFStringRef const kCFNumberFormatterUseSignificantDigitsKey;
108+
CF_EXPORT CFStringRef const kCFNumberFormatterZeroSymbolKey;
109+
CF_EXPORT CFStringRef const kCFNumberFormatterUsesCharacterDirectionKey;
110+
111+
CF_EXPORT CFStringRef const kCFCalendarIdentifierGregorian;
112+
CF_EXPORT CFStringRef const kCFCalendarIdentifierBuddhist;
113+
CF_EXPORT CFStringRef const kCFCalendarIdentifierJapanese;
114+
CF_EXPORT CFStringRef const kCFCalendarIdentifierIslamic;
115+
CF_EXPORT CFStringRef const kCFCalendarIdentifierIslamicCivil;
116+
CF_EXPORT CFStringRef const kCFCalendarIdentifierIslamicTabular;
117+
CF_EXPORT CFStringRef const kCFCalendarIdentifierIslamicUmmAlQura;
118+
CF_EXPORT CFStringRef const kCFCalendarIdentifierHebrew;
119+
CF_EXPORT CFStringRef const kCFCalendarIdentifierChinese;
120+
CF_EXPORT CFStringRef const kCFCalendarIdentifierRepublicOfChina;
121+
CF_EXPORT CFStringRef const kCFCalendarIdentifierPersian;
122+
CF_EXPORT CFStringRef const kCFCalendarIdentifierIndian;
123+
CF_EXPORT CFStringRef const kCFCalendarIdentifierISO8601;
124+
CF_EXPORT CFStringRef const kCFCalendarIdentifierCoptic;
125+
CF_EXPORT CFStringRef const kCFCalendarIdentifierEthiopicAmeteMihret;
126+
CF_EXPORT CFStringRef const kCFCalendarIdentifierEthiopicAmeteAlem;
127+
128+

‎Sources/CoreFoundation/include/CFString.h

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#if !defined(__COREFOUNDATION_CFSTRING__)
1111
#define __COREFOUNDATION_CFSTRING__ 1
1212

13+
#include "CFTargetConditionals.h"
14+
1315
#include "CFBase.h"
1416
#include "CFArray.h"
1517
#include "CFData.h"

‎Sources/CoreFoundation/include/CoreFoundation.h

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
#include "CFUUID.h"
7373
#include "CFUtilities.h"
7474
#include "CFBundle.h"
75+
#include "CFConstantKeys.h"
7576

7677
#include "ForSwiftFoundationOnly.h"
7778

‎Sources/CoreFoundation/include/CoreFoundation_Prefix.h

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
88
*/
99

10+
#ifndef DEPLOYMENT_RUNTIME_SWIFT
11+
#define DEPLOYMENT_RUNTIME_SWIFT 1
12+
#endif
13+
1014
#ifndef __COREFOUNDATION_PREFIX_H__
1115
#define __COREFOUNDATION_PREFIX_H__ 1
1216

‎Sources/CoreFoundation/include/ForFoundationOnly.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ CF_EXPORT void *__CFURLReservedPtr(CFURLRef url);
647647
CF_EXPORT void __CFURLSetReservedPtr(CFURLRef url, void *_Nullable ptr);
648648
CF_EXPORT CFStringEncoding _CFURLGetEncoding(CFURLRef url);
649649

650-
CF_CROSS_PLATFORM_EXPORT void _CFURLInitWithFileSystemPathRelativeToBase(CFURLRef url, CFStringRef fileSystemPath, CFURLPathStyle pathStyle, Boolean isDirectory, _Nullable CFURLRef baseURL);
650+
CF_CROSS_PLATFORM_EXPORT void _CFURLInitWithFileSystemPathRelativeToBase(CFURLRef url, CFStringRef fileSystemPath, CFURLPathStyle pathStyle, bool isDirectory, _Nullable CFURLRef baseURL);
651651
CF_CROSS_PLATFORM_EXPORT Boolean _CFURLInitWithURLString(CFURLRef url, CFStringRef string, Boolean checkForLegalCharacters, _Nullable CFURLRef baseURL);
652652
CF_CROSS_PLATFORM_EXPORT Boolean _CFURLInitAbsoluteURLWithBytes(CFURLRef url, const UInt8 *relativeURLBytes, CFIndex length, CFStringEncoding encoding, _Nullable CFURLRef baseURL);
653653

‎Sources/CoreFoundation/include/ForSwiftFoundationOnly.h

+2-7
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ _CF_EXPORT_SCOPE_BEGIN
9494

9595
CF_PRIVATE Boolean __CFAllocatorRespectsHintZeroWhenAllocating(CFAllocatorRef _Nullable allocator);
9696

97-
CF_CROSS_PLATFORM_EXPORT Boolean _CFCalendarGetNextWeekend(CFCalendarRef calendar, _CFCalendarWeekendRange *range);
98-
CF_CROSS_PLATFORM_EXPORT void _CFCalendarEnumerateDates(CFCalendarRef calendar, CFDateRef start, CFDateComponentsRef matchingComponents, CFOptionFlags opts, void (^block)(CFDateRef _Nullable, Boolean, Boolean*));
99-
CF_EXPORT void CFCalendarSetGregorianStartDate(CFCalendarRef calendar, CFDateRef _Nullable date);
100-
CF_EXPORT _Nullable CFDateRef CFCalendarCopyGregorianStartDate(CFCalendarRef calendar);
101-
10297
struct __CFSwiftObject {
10398
uintptr_t isa;
10499
};
@@ -445,8 +440,8 @@ CF_EXPORT _Nullable CFErrorRef CFReadStreamCopyError(CFReadStreamRef _Null_unspe
445440
CF_EXPORT _Nullable CFErrorRef CFWriteStreamCopyError(CFWriteStreamRef _Null_unspecified stream);
446441

447442
CF_CROSS_PLATFORM_EXPORT CFStringRef _Nullable _CFBundleCopyExecutablePath(CFBundleRef bundle);
448-
CF_CROSS_PLATFORM_EXPORT Boolean _CFBundleSupportsFHSBundles(void);
449-
CF_CROSS_PLATFORM_EXPORT Boolean _CFBundleSupportsFreestandingBundles(void);
443+
CF_CROSS_PLATFORM_EXPORT bool _CFBundleSupportsFHSBundles(void);
444+
CF_CROSS_PLATFORM_EXPORT bool _CFBundleSupportsFreestandingBundles(void);
450445
CF_CROSS_PLATFORM_EXPORT CFStringRef _Nullable _CFBundleCopyLoadedImagePathForAddress(const void *p);
451446
#endif
452447

‎Sources/CoreFoundation/internalInclude/CFCalendar_Internal.h

-3
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ CF_PRIVATE void __CFCalendarZapCal(CFCalendarRef calendar);
8888

8989
CF_PRIVATE CFCalendarRef _CFCalendarCreateCopy(CFAllocatorRef allocator, CFCalendarRef calendar);
9090

91-
CF_PRIVATE Boolean _CFCalendarIsDateInWeekend(CFCalendarRef calendar, CFDateRef date);
92-
CF_PRIVATE Boolean _CFCalendarGetNextWeekend(CFCalendarRef calendar, _CFCalendarWeekendRange *range);
93-
9491
CF_PRIVATE CFStringRef _CFDateComponentsCopyDescriptionInner(CFDateComponentsRef dc);
9592
CF_PRIVATE _Nullable CFDateRef _CFCalendarCreateDateByAddingDateComponentsToDate(CFAllocatorRef allocator, CFCalendarRef calendar, CFDateComponentsRef dateComp, CFDateRef date, CFOptionFlags opts);
9693

‎Sources/CoreFoundation/internalInclude/CFLocaleInternal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
CFLocaleInternal.h
2+
CFConstantKeys.h
33
Copyright (c) 2008-2019, Apple Inc. and the Swift project authors
44
55
Portions Copyright (c) 2014-2019, Apple Inc. and the Swift project authors

‎Sources/Foundation/Bridging.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@_implementationOnly import CoreFoundation
13+
@_implementationOnly import _CoreFoundation
1414

1515
#if canImport(ObjectiveC)
1616
import ObjectiveC

0 commit comments

Comments
 (0)