Merge pull request #502 from compnerd/key-visibility

Author: swift-ci

CoreFoundation/Locale.subproj/CFDateFormatter.c

@@ -41,7 +41,7 @@ typedef CF_ENUM(CFIndex, CFDateFormatterAmbiguousYearHandling) {
 
 extern UCalendar *__CFCalendarCreateUCalendar(CFStringRef calendarID, CFStringRef localeID, CFTimeZoneRef tz);
 
-static CONST_STRING_DECL(kCFDateFormatterFormattingContextKey, "kCFDateFormatterFormattingContextKey");
+PE_CONST_STRING_DECL(kCFDateFormatterFormattingContextKey, "kCFDateFormatterFormattingContextKey");
 
 CF_EXPORT const CFStringRef kCFDateFormatterCalendarIdentifierKey;
 

CoreFoundation/Locale.subproj/CFNumberFormatter.c

@@ -26,7 +26,7 @@
 static void __CFNumberFormatterCustomize(CFNumberFormatterRef formatter);
 static CFStringRef __CFNumberFormatterCreateCompressedString(CFStringRef inString, Boolean isFormat, CFRange *rangep);
 static UErrorCode __CFNumberFormatterApplyPattern(CFNumberFormatterRef formatter, CFStringRef pattern);
-static CONST_STRING_DECL(kCFNumberFormatterFormattingContextKey, "kCFNumberFormatterFormattingContextKey");
+CONST_STRING_DECL(kCFNumberFormatterFormattingContextKey, "kCFNumberFormatterFormattingContextKey");
 
 #define BUFFER_SIZE 768
 

CoreFoundation/URL.subproj/CFURL.c

@@ -59,25 +59,12 @@ CF_EXPORT CFURLRef _CFURLCreateCurrentDirectoryURL(CFAllocatorRef allocator) CF_
 static Boolean _CFURLHasFileURLScheme(CFURLRef url, Boolean *hasScheme);
 #endif
 
-
-
-// When __CONSTANT_CFSTRINGS__ is not defined, we have separate macros for static and exported constant strings, but
-// when it is defined, we must prefix with static to prevent the string from being exported
-#ifdef __CONSTANT_CFSTRINGS__
-static CONST_STRING_DECL(kCFURLHTTPScheme, "http")
-static CONST_STRING_DECL(kCFURLHTTPSScheme, "https")
-static CONST_STRING_DECL(kCFURLFileScheme, "file")
-static CONST_STRING_DECL(kCFURLDataScheme, "data")
-static CONST_STRING_DECL(kCFURLFTPScheme, "ftp")
-static CONST_STRING_DECL(kCFURLLocalhost, "localhost")
-#else
-CONST_STRING_DECL(kCFURLHTTPScheme, "http")
-CONST_STRING_DECL(kCFURLHTTPSScheme, "https")
-CONST_STRING_DECL(kCFURLFileScheme, "file")
-CONST_STRING_DECL(kCFURLDataScheme, "data")
-CONST_STRING_DECL(kCFURLFTPScheme, "ftp")
-CONST_STRING_DECL(kCFURLLocalhost, "localhost")
-#endif
+PE_CONST_STRING_DECL(kCFURLHTTPScheme, "http")
+PE_CONST_STRING_DECL(kCFURLHTTPSScheme, "https")
+PE_CONST_STRING_DECL(kCFURLFileScheme, "file")
+PE_CONST_STRING_DECL(kCFURLDataScheme, "data")
+PE_CONST_STRING_DECL(kCFURLFTPScheme, "ftp")
+PE_CONST_STRING_DECL(kCFURLLocalhost, "localhost")
 
 #if DEBUG_URL_MEMORY_USAGE
 static uint numURLs = 0;                    // number of URLs allocated