Skip to content

Commit 39d47ff

Browse files
committed
CoreFoundation: remove _CFGetWindowsAppleSystemLibraryDirectory
The current source base does not have `_CFGetWindowsAppleSystemLibraryDirectory` defined. Remove the single use of the function which would attempt to provide a location for tzone.tab for time zone information. The current implementation is able to inspect the time zone information from the Windows registry. Remove this function.
1 parent f72877d commit 39d47ff

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

CoreFoundation/Base.subproj/CFPriv.h

-1
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,6 @@ CF_EXPORT CFPropertyListRef _CFBundleCreateFilteredLocalizedInfoPlist(CFBundleRe
611611

612612
CF_EXPORT CFStringRef _CFGetWindowsAppleAppDataDirectory(void);
613613
CF_EXPORT CFArrayRef _CFGetWindowsBinaryDirectories(void);
614-
CF_EXPORT CFStringRef _CFGetWindowsAppleSystemLibraryDirectory(void);
615614

616615
// If your Windows application does not use a CFRunLoop on the main thread (perhaps because it is reserved for handling UI events via Windows API), then call this function to make distributed notifications arrive using a different run loop.
617616
CF_EXPORT void _CFNotificationCenterSetRunLoop(CFNotificationCenterRef nc, CFRunLoopRef rl);

CoreFoundation/NumberDate.subproj/CFTimeZone.c

+1-5
Original file line numberDiff line numberDiff line change
@@ -679,14 +679,10 @@ CFTimeZoneRef CFTimeZoneCreateWithWindowsName(CFAllocatorRef allocator, CFString
679679
return retval;
680680
}
681681

682-
extern CFStringRef _CFGetWindowsAppleSystemLibraryDirectory(void);
683682
static void __InitTZStrings(void) {
684683
static CFLock_t __CFTZDirLock = CFLockInit;
685684
__CFLock(&__CFTZDirLock);
686-
if (!__tzZoneInfo) {
687-
CFStringRef winDir = _CFGetWindowsAppleSystemLibraryDirectory();
688-
__tzZoneInfo = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@\\etc\\zoneinfo"), winDir);
689-
}
685+
// TODO(compnerd) figure out how to initialize __tzZoneInfo
690686
if (!__tzDir && __tzZoneInfo) {
691687
int length = CFStringGetLength(__tzZoneInfo) + sizeof("\\zone.tab") + 1;
692688
__tzDir = malloc(length); // If we don't use ascii, we'll need to malloc more space

0 commit comments

Comments
 (0)