Skip to content

Commit 1323bae

Browse files
authored
Revert "_FoundationUnicode: apply symbol renaming for non-Darwin targets (#63)" (#65)
This reverts commit 673a106.
1 parent 673a106 commit 1323bae

File tree

4 files changed

+2
-1990
lines changed

4 files changed

+2
-1990
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ add_compile_definitions(
4545
$<$<COMPILE_LANGUAGE:C,CXX>:U_HAVE_STRTOD_L=1>
4646
$<$<COMPILE_LANGUAGE:C,CXX>:U_HAVE_XLOCALE_H=1>
4747
$<$<COMPILE_LANGUAGE:C,CXX>:U_HAVE_STRING_VIEW=1>
48-
$<$<COMPILE_LANGUAGE:C,CXX>:U_DISABLE_RENAMING=$<IF:$<PLATFORM_ID:Darwin>,1,0>>
48+
$<$<COMPILE_LANGUAGE:C,CXX>:U_DISABLE_RENAMING=1>
4949
$<$<COMPILE_LANGUAGE:C,CXX>:U_COMBINED_IMPLEMENTATION>
5050
$<$<COMPILE_LANGUAGE:C,CXX>:U_COMMON_IMPLEMENTATION>
5151
$<$<COMPILE_LANGUAGE:C,CXX>:U_I18N_IMPLEMENTATION>

Package.swift

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,7 @@ var buildSettings: [CXXSetting] = [
3434
.define("U_HAVE_STRTOD_L", to: "1"),
3535
.define("U_HAVE_XLOCALE_H", to: "1"),
3636
.define("U_HAVE_STRING_VIEW", to: "1"),
37-
.define(
38-
"U_DISABLE_RENAMING", to: "1",
39-
.when(platforms: [
40-
.macOS,
41-
.iOS,
42-
.tvOS,
43-
.watchOS,
44-
.visionOS,
45-
])),
46-
.define(
47-
"U_DISABLE_RENAMING", to: "0",
48-
.when(platforms: [
49-
.linux,
50-
.windows,
51-
.android,
52-
.wasi,
53-
])),
37+
.define("U_DISABLE_RENAMING", to: "1"),
5438
.define("U_COMBINED_IMPLEMENTATION"),
5539
.define("U_COMMON_IMPLEMENTATION"),
5640
.define("U_I18N_IMPLEMENTATION"),

icuSources/include/_foundation_unicode/uconfig.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,9 @@
101101
#ifndef U_DISABLE_RENAMING
102102
#if APPLE_ICU_CHANGES
103103
//rdar://60884991 #58 Replace installsrc patching with changes directly in header files
104-
#if defined(__APPLE__)
105104
#define U_DISABLE_RENAMING 1
106105
#else
107106
#define U_DISABLE_RENAMING 0
108-
#endif
109-
#else
110-
#define U_DISABLE_RENAMING 0
111107
#endif // APPLE_ICU_CHANGES
112108
#endif
113109

0 commit comments

Comments
 (0)