Skip to content

Commit e0cd4ea

Browse files
committed
Erase DEPLOYMENT_TARGET_EMBEDDED_MINI
1 parent 7a2b665 commit e0cd4ea

File tree

4 files changed

+3
-22
lines changed

4 files changed

+3
-22
lines changed

Diff for: CoreFoundation/Base.subproj/CFRuntime.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ bool (*__CFObjCIsCollectable)(void *) = NULL;
268268
// The constant string class reference is set at link time to _NSCFConstantString
269269
void *__CFConstantStringClassReferencePtr = &_CF_CONSTANT_STRING_SWIFT_CLASS;
270270
#else
271-
#if !__CONSTANT_CFSTRINGS__ || DEPLOYMENT_TARGET_EMBEDDED_MINI
271+
#if !__CONSTANT_CFSTRINGS__
272272
// Compiler uses this symbol name; must match compiler built-in decl, so we use 'int'
273273
#if TARGET_RT_64_BIT
274274
int __CFConstantStringClassReference[24] = {0};

Diff for: CoreFoundation/Base.subproj/CFUtilities.c

+1-8
Original file line numberDiff line numberDiff line change
@@ -264,19 +264,12 @@ static CFDictionaryRef _CFCopyVersionDictionary(CFStringRef path) {
264264
if (url) CFRelease(url);
265265

266266
if (plist) {
267-
#if DEPLOYMENT_TARGET_EMBEDDED_MINI
268-
CFStringRef fullVersion, vers, versExtra, build;
269-
CFStringRef versionString = CFRetain(_kCFSystemVersionProductVersionStringKey);
270-
CFStringRef buildString = CFRetain(_kCFSystemVersionBuildStringKey);
271-
CFStringRef fullVersionString = CFRetain(CFSTR("FullVersionString"));
272-
#else
273267
CFBundleRef locBundle = NULL;
274268
CFStringRef fullVersion, vers, versExtra, build;
275269
CFStringRef versionString = _CFCopyLocalizedVersionKey(&locBundle, _kCFSystemVersionProductVersionStringKey);
276270
CFStringRef buildString = _CFCopyLocalizedVersionKey(&locBundle, _kCFSystemVersionBuildStringKey);
277271
CFStringRef fullVersionString = _CFCopyLocalizedVersionKey(&locBundle, CFSTR("FullVersionString"));
278272
if (locBundle) CFRelease(locBundle);
279-
#endif
280273

281274
// Now build the full version string
282275
if (CFEqual(fullVersionString, CFSTR("FullVersionString"))) {
@@ -719,7 +712,7 @@ typedef enum {
719712

720713
static bool also_do_stderr(const _cf_logging_style style) {
721714
bool result = false;
722-
#if DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX
715+
#if DEPLOYMENT_TARGET_LINUX
723716
// just log to stderr, other logging facilities are out
724717
result = true;
725718
#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED

Diff for: CoreFoundation/Locale.subproj/CFLocale.c

-12
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,6 @@ uameasfmt_getUnitsForUsage( const char* locale,
5252
#include <stdio.h>
5353
#include <string.h>
5454

55-
#if DEPLOYMENT_TARGET_EMBEDDED_MINI
56-
// Some compatibility definitions
57-
#define ULOC_FULLNAME_CAPACITY 157
58-
#define ULOC_KEYWORD_AND_VALUES_CAPACITY 100
59-
60-
//typedef long UErrorCode;
61-
//#define U_BUFFER_OVERFLOW_ERROR 15
62-
//#define U_ZERO_ERROR 0
63-
//
64-
//typedef uint16_t UChar;
65-
#endif
66-
6755
#if DEPLOYMENT_TARGET_EMBEDDED
6856
#include <mach-o/dyld_priv.h>
6957
#endif

Diff for: CoreFoundation/StringEncodings.subproj/CFUniChar.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ extern void _CFGetFrameworkPath(wchar_t *path, int maxLength);
3434

3535
#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
3636
#define __kCFCharacterSetDir "/System/Library/CoreServices"
37-
#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD || DEPLOYMENT_TARGET_EMBEDDED_MINI
37+
#elif DEPLOYMENT_TARGET_LINUX || TARGET_OS_BSD
3838
#define __kCFCharacterSetDir "/usr/local/share/CoreFoundation"
3939
#elif DEPLOYMENT_TARGET_WINDOWS
4040
#define __kCFCharacterSetDir "\\Windows\\CoreFoundation"

0 commit comments

Comments
 (0)