Skip to content

Commit a7824be

Browse files
crummelcrummel
authored
Merge pull request #2096 from crummel/fixOsxBooleans3.1
[release/3.1] Add missing TRUE and FALSE definitions for OSX
2 parents e05eaa1 + e2fa5c6 commit a7824be

File tree

1 file changed

+191
-0
lines changed

1 file changed

+191
-0
lines changed

‎patches/coreclr/0005-Add-missing-TRUE-and-FALSE-definitions.patch

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
From a34aef9d536695e3527c4c36e06adea803f0375a Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <crummel@microsoft.com>
3+
Date: Fri, 19 Mar 2021 14:32:00 -0500
4+
Subject: [PATCH 5/5] Add missing TRUE and FALSE definitions.
5+
6+
---
7+
src/corefx/System.Globalization.Native/pal_calendarData.c | 8 ++++++++
8+
src/corefx/System.Globalization.Native/pal_casing.c | 8 ++++++++
9+
src/corefx/System.Globalization.Native/pal_collation.c | 8 ++++++++
10+
src/corefx/System.Globalization.Native/pal_icushim.c | 8 ++++++++
11+
src/corefx/System.Globalization.Native/pal_locale.c | 8 ++++++++
12+
.../System.Globalization.Native/pal_localeNumberData.c | 8 ++++++++
13+
.../System.Globalization.Native/pal_localeStringData.c | 8 ++++++++
14+
.../System.Globalization.Native/pal_normalization.c | 8 ++++++++
15+
src/corefx/System.Globalization.Native/pal_timeZoneInfo.c | 8 ++++++++
16+
9 files changed, 72 insertions(+)
17+
18+
diff --git a/src/corefx/System.Globalization.Native/pal_calendarData.c b/src/corefx/System.Globalization.Native/pal_calendarData.c
19+
index 96336fced7..db9745425e 100644
20+
--- a/src/corefx/System.Globalization.Native/pal_calendarData.c
21+
+++ b/src/corefx/System.Globalization.Native/pal_calendarData.c
22+
@@ -21,6 +21,14 @@
23+
24+
#define JAPANESE_LOCALE_AND_CALENDAR "ja_JP@calendar=japanese"
25+
26+
+#ifndef FALSE
27+
+#define FALSE 0
28+
+#endif
29+
+
30+
+#ifndef TRUE
31+
+#define TRUE 1
32+
+#endif
33+
+
34+
const UChar UDAT_MONTH_DAY_UCHAR[] = {'M', 'M', 'M', 'M', 'd', '\0'};
35+
const UChar UDAT_YEAR_NUM_MONTH_DAY_UCHAR[] = {'y', 'M', 'd', '\0'};
36+
const UChar UDAT_YEAR_MONTH_UCHAR[] = {'y', 'M', 'M', 'M', 'M', '\0'};
37+
diff --git a/src/corefx/System.Globalization.Native/pal_casing.c b/src/corefx/System.Globalization.Native/pal_casing.c
38+
index e6b27d3eb8..6281757ed9 100644
39+
--- a/src/corefx/System.Globalization.Native/pal_casing.c
40+
+++ b/src/corefx/System.Globalization.Native/pal_casing.c
41+
@@ -9,6 +9,14 @@
42+
#include "pal_casing.h"
43+
#include "pal_icushim.h"
44+
45+
+#ifndef FALSE
46+
+#define FALSE 0
47+
+#endif
48+
+
49+
+#ifndef TRUE
50+
+#define TRUE 1
51+
+#endif
52+
+
53+
/*
54+
Function:
55+
ChangeCase
56+
diff --git a/src/corefx/System.Globalization.Native/pal_collation.c b/src/corefx/System.Globalization.Native/pal_collation.c
57+
index 675d80521b..05f4d67e3a 100644
58+
--- a/src/corefx/System.Globalization.Native/pal_collation.c
59+
+++ b/src/corefx/System.Globalization.Native/pal_collation.c
60+
@@ -12,6 +12,14 @@
61+
62+
#include "pal_collation.h"
63+
64+
+#ifndef FALSE
65+
+#define FALSE 0
66+
+#endif
67+
+
68+
+#ifndef TRUE
69+
+#define TRUE 1
70+
+#endif
71+
+
72+
c_static_assert_msg(UCOL_EQUAL == 0, "managed side requires 0 for equal strings");
73+
c_static_assert_msg(UCOL_LESS < 0, "managed side requires less than zero for a < b");
74+
c_static_assert_msg(UCOL_GREATER > 0, "managed side requires greater than zero for a > b");
75+
diff --git a/src/corefx/System.Globalization.Native/pal_icushim.c b/src/corefx/System.Globalization.Native/pal_icushim.c
76+
index 04f73759cd..f8747d2db0 100644
77+
--- a/src/corefx/System.Globalization.Native/pal_icushim.c
78+
+++ b/src/corefx/System.Globalization.Native/pal_icushim.c
79+
@@ -11,6 +11,14 @@
80+
81+
#include "pal_icushim.h"
82+
83+
+#ifndef FALSE
84+
+#define FALSE 0
85+
+#endif
86+
+
87+
+#ifndef TRUE
88+
+#define TRUE 1
89+
+#endif
90+
+
91+
// Define pointers to all the used ICU functions
92+
#define PER_FUNCTION_BLOCK(fn, lib) __typeof(fn)* fn##_ptr;
93+
FOR_ALL_ICU_FUNCTIONS
94+
diff --git a/src/corefx/System.Globalization.Native/pal_locale.c b/src/corefx/System.Globalization.Native/pal_locale.c
95+
index 99eea3744a..6626a59731 100644
96+
--- a/src/corefx/System.Globalization.Native/pal_locale.c
97+
+++ b/src/corefx/System.Globalization.Native/pal_locale.c
98+
@@ -11,6 +11,14 @@
99+
100+
#include "pal_locale.h"
101+
102+
+#ifndef FALSE
103+
+#define FALSE 0
104+
+#endif
105+
+
106+
+#ifndef TRUE
107+
+#define TRUE 1
108+
+#endif
109+
+
110+
int32_t UErrorCodeToBool(UErrorCode status)
111+
{
112+
if (U_SUCCESS(status))
113+
diff --git a/src/corefx/System.Globalization.Native/pal_localeNumberData.c b/src/corefx/System.Globalization.Native/pal_localeNumberData.c
114+
index 5663c63d82..ea568b7b50 100644
115+
--- a/src/corefx/System.Globalization.Native/pal_localeNumberData.c
116+
+++ b/src/corefx/System.Globalization.Native/pal_localeNumberData.c
117+
@@ -22,6 +22,14 @@
118+
119+
#define ARRAY_LENGTH(array) (sizeof(array) / sizeof(array[0]))
120+
121+
+#ifndef FALSE
122+
+#define FALSE 0
123+
+#endif
124+
+
125+
+#ifndef TRUE
126+
+#define TRUE 1
127+
+#endif
128+
+
129+
/*
130+
Function:
131+
NormalizeNumericPattern
132+
diff --git a/src/corefx/System.Globalization.Native/pal_localeStringData.c b/src/corefx/System.Globalization.Native/pal_localeStringData.c
133+
index a989b57f79..180c247051 100644
134+
--- a/src/corefx/System.Globalization.Native/pal_localeStringData.c
135+
+++ b/src/corefx/System.Globalization.Native/pal_localeStringData.c
136+
@@ -9,6 +9,14 @@
137+
138+
#include "pal_localeStringData.h"
139+
140+
+#ifndef FALSE
141+
+#define FALSE 0
142+
+#endif
143+
+
144+
+#ifndef TRUE
145+
+#define TRUE 1
146+
+#endif
147+
+
148+
/*
149+
Function:
150+
GetLocaleInfoDecimalFormatSymbol
151+
diff --git a/src/corefx/System.Globalization.Native/pal_normalization.c b/src/corefx/System.Globalization.Native/pal_normalization.c
152+
index 1fc880b6d0..05e44731a7 100644
153+
--- a/src/corefx/System.Globalization.Native/pal_normalization.c
154+
+++ b/src/corefx/System.Globalization.Native/pal_normalization.c
155+
@@ -8,6 +8,14 @@
156+
#include "pal_icushim.h"
157+
#include "pal_normalization.h"
158+
159+
+#ifndef FALSE
160+
+#define FALSE 0
161+
+#endif
162+
+
163+
+#ifndef TRUE
164+
+#define TRUE 1
165+
+#endif
166+
+
167+
const UNormalizer2* GetNormalizerForForm(NormalizationForm normalizationForm, UErrorCode* pErrorCode)
168+
{
169+
switch (normalizationForm)
170+
diff --git a/src/corefx/System.Globalization.Native/pal_timeZoneInfo.c b/src/corefx/System.Globalization.Native/pal_timeZoneInfo.c
171+
index bf2a9dca0f..9de8b14915 100644
172+
--- a/src/corefx/System.Globalization.Native/pal_timeZoneInfo.c
173+
+++ b/src/corefx/System.Globalization.Native/pal_timeZoneInfo.c
174+
@@ -8,6 +8,14 @@
175+
176+
#include "pal_timeZoneInfo.h"
177+
178+
+#ifndef FALSE
179+
+#define FALSE 0
180+
+#endif
181+
+
182+
+#ifndef TRUE
183+
+#define TRUE 1
184+
+#endif
185+
+
186+
/*
187+
Gets the localized display name for the specified time zone.
188+
*/
189+
--
190+
2.18.0
191+

0 commit comments

Comments
 (0)