Skip to content

Commit e4def8e

Browse files
committed
CoreFoundation: remove CFCopySearchPathForDirectoriesInDomains on Windows
Remove the `CFCopySearchPathForDirectoriesInDomains` interface from the Windows build. This interface is not used anywhere in the Windows path and is not exported. The single use was in the POSIX error domain which does not apply to Windows.
1 parent f3a9de1 commit e4def8e

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

CoreFoundation/Base.subproj/CFPriv.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,10 @@ typedef CF_OPTIONS(CFOptionFlags, CFSearchPathDomainMask) {
220220
kCFAllDomainsMask = 0x0ffff /* all domains: all of the above and more, future items */
221221
};
222222

223+
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
223224
CF_EXPORT
224225
CFArrayRef CFCopySearchPathForDirectoriesInDomains(CFSearchPathDirectory directory, CFSearchPathDomainMask domainMask, Boolean expandTilde);
226+
#endif
225227

226228

227229
/* Obsolete keys */

CoreFoundation/Base.subproj/CFSystemDirectories.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ CFSearchPathEnumerationState __CFGetNextSearchPathEnumeration(CFSearchPathEnumer
5252
#endif
5353

5454

55-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS
55+
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
5656

5757
CFArrayRef CFCopySearchPathForDirectoriesInDomains(CFSearchPathDirectory directory, CFSearchPathDomainMask domainMask, Boolean expandTilde) {
5858
CFMutableArrayRef array;

CoreFoundation/Error.subproj/CFError.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ static CFTypeRef _CFErrorPOSIXCallBack(CFErrorRef err, CFStringRef key) CF_RETUR
495495
if (!errStr) return NULL;
496496
if (CFEqual(key, kCFErrorDescriptionKey)) return errStr; // If all we wanted was the non-localized description, we're done
497497

498-
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS
498+
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
499499
// We need a kCFErrorLocalizedFailureReasonKey, so look up a possible localization for the error message
500500
// Look for the bundle in /System/Library/CoreServices/CoreTypes.bundle
501501
CFArrayRef paths = CFCopySearchPathForDirectoriesInDomains(kCFLibraryDirectory, kCFSystemDomainMask, false);

0 commit comments

Comments
 (0)