Merge pull request #1686 from copumpkin/fix-swift-preprocessor-bug

swift-ci · web-flow · commit 6bd6e4d3825f · 2018-09-11T10:35:47.000-07:00
diff --git a/CoreFoundation/NumberDate.subproj/CFTimeZone.c b/CoreFoundation/NumberDate.subproj/CFTimeZone.c
@@ -1013,8 +1013,6 @@ void CFTimeZoneSetAbbreviationDictionary(CFDictionaryRef dict) {
     __CFTimeZoneUnlockGlobal();
 }
 
-#if DEPLOYMENT_RUNTIME_SWIFT
-
 CF_INLINE const UChar *STRING_to_UTF16(CFStringRef S) { // UTF16String
     CFIndex length = CFStringGetLength((CFStringRef)S);
     UChar *buffer = (UChar *)malloc((length + 1) * sizeof(UChar));
@@ -1244,7 +1242,6 @@ Boolean _CFTimeZoneInit(CFTimeZoneRef timeZone, CFStringRef name, CFDataRef data
     }
     return false;
 }
-#endif
 
 CFTimeZoneRef CFTimeZoneCreate(CFAllocatorRef allocator, CFStringRef name, CFDataRef data) {
 // assert:    (NULL != name && NULL != data);

Original file line number	Diff line number	Diff line change
`@@ -1013,8 +1013,6 @@ void CFTimeZoneSetAbbreviationDictionary(CFDictionaryRef dict) {`
`1013`	`1013`	`__CFTimeZoneUnlockGlobal();`
`1014`	`1014`	`}`
`1015`	`1015`
`1016`		`-#if DEPLOYMENT_RUNTIME_SWIFT`
`1017`		`-`
`1018`	`1016`	`CF_INLINE const UChar *STRING_to_UTF16(CFStringRef S) { // UTF16String`
`1019`	`1017`	`CFIndex length = CFStringGetLength((CFStringRef)S);`
`1020`	`1018`	`UChar buffer = (UChar )malloc((length + 1) * sizeof(UChar));`
`@@ -1244,7 +1242,6 @@ Boolean _CFTimeZoneInit(CFTimeZoneRef timeZone, CFStringRef name, CFDataRef data`
`1244`	`1242`	`}`
`1245`	`1243`	`return false;`
`1246`	`1244`	`}`
`1247`		`-#endif`
`1248`	`1245`
`1249`	`1246`	`CFTimeZoneRef CFTimeZoneCreate(CFAllocatorRef allocator, CFStringRef name, CFDataRef data) {`
`1250`	`1247`	`// assert: (NULL != name && NULL != data);`