commit d533fd5719d318cf4d86b04e76425829e0e0fef5
author Markus Scherer <markus.icu@gmail.com> Fri Oct 02 11:38:52 2020 -0700
committer Markus Scherer <markus.icu@gmail.com> Fri Oct 02 14:20:44 2020 -0700
tree 2261e0863e3e8e8e129108254c6078d098f39b8c
parent b74b0c957ef5843a14eaeb7064f5e1bc9e2e0054

ICU-20853 undef Solaris x86 register macros where they conflict

icu4c/source/common/ubidiimp.h

diff --git a/icu4c/source/common/ubidiimp.h b/icu4c/source/common/ubidiimp.h
index e11c7fa..e48fc6f 100644
--- a/icu4c/source/common/ubidiimp.h
+++ b/icu4c/source/common/ubidiimp.h
@@ -26,6 +26,14 @@
 
 /* miscellaneous definitions ---------------------------------------------- */
 
+// ICU-20853=ICU-20935 Solaris #defines CS and ES in sys/regset.h
+#ifdef CS
+#   undef CS
+#endif
+#ifdef ES
+#   undef ES
+#endif
+
 typedef uint8_t DirProp;
 typedef uint32_t Flags;
 

icu4c/source/test/intltest/numbertest.h

diff --git a/icu4c/source/test/intltest/numbertest.h b/icu4c/source/test/intltest/numbertest.h
index 7603263..39c1a12 100644
--- a/icu4c/source/test/intltest/numbertest.h
+++ b/icu4c/source/test/intltest/numbertest.h
@@ -16,6 +16,11 @@
 #include "unicode/numberformatter.h"
 #include "unicode/numberrangeformatter.h"
 
+// ICU-20241 Solaris #defines ESP in sys/regset.h
+#ifdef ESP
+#   undef ESP
+#endif
+
 using namespace icu::number;
 using namespace icu::number::impl;
 using namespace icu::numparse;