organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 06:25:30 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-20853 undef Solaris x86 register macros where they conflict

Browse source
This commit is contained in:
Markus Scherer 2020-10-02 11:38:52 -07:00
parent b74b0c957e
commit d533fd5719
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icu4c/source/common/ubidiimp.h
View file

@ -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;

5
icu4c/source/test/intltest/numbertest.h
View file

@ -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;