From d533fd5719d318cf4d86b04e76425829e0e0fef5 Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Fri, 2 Oct 2020 11:38:52 -0700 Subject: [PATCH] ICU-20853 undef Solaris x86 register macros where they conflict --- icu4c/source/common/ubidiimp.h | 8 ++++++++ icu4c/source/test/intltest/numbertest.h | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/icu4c/source/common/ubidiimp.h b/icu4c/source/common/ubidiimp.h index e11c7fabccd..e48fc6f9416 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; diff --git a/icu4c/source/test/intltest/numbertest.h b/icu4c/source/test/intltest/numbertest.h index 76032636afe..39c1a12b250 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; -- 2.40.0