diff options
author | Karl Berry <karl@freefriends.org> | 2020-01-04 23:46:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-01-04 23:46:18 +0000 |
commit | 2025f9acd9d2a8f4ea3b8e7d8eaa3196b8a03471 (patch) | |
tree | cf9a4ede21cd21d2eef19d33947a1a1f9e33942a /Build/source/libs | |
parent | 17e977995edf78fb75e726a2b6a097461186a90b (diff) |
#undef ES and CS for x86_64-solaris(10), from Mojca
git-svn-id: svn://tug.org/texlive/trunk@53323 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r-- | Build/source/libs/icu/TLpatches/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-10-ES | 16 | ||||
-rw-r--r-- | Build/source/libs/icu/icu-src/source/common/ubidiimp.h | 2 |
3 files changed, 25 insertions, 0 deletions
diff --git a/Build/source/libs/icu/TLpatches/ChangeLog b/Build/source/libs/icu/TLpatches/ChangeLog index 6a1576401ae..a686aaf1b40 100644 --- a/Build/source/libs/icu/TLpatches/ChangeLog +++ b/Build/source/libs/icu/TLpatches/ChangeLog @@ -1,3 +1,10 @@ +2020-01-04 Karl Berry <karl@freefriends.org> + + * patch-10-ES: new patch from Mojca. + https://tug.org/pipermail/tlbuild/2020q1/004599.html + https://tug.org/pipermail/tlbuild/2020q1/004599.html + https://docs.oracle.com/cd/E19253-01/816-5174/proc-4/index.html + 2019-12-12 Karl Berry <karl@freefriends.org> * Update for icu-65.1. diff --git a/Build/source/libs/icu/TLpatches/patch-10-ES b/Build/source/libs/icu/TLpatches/patch-10-ES new file mode 100644 index 00000000000..d129579be58 --- /dev/null +++ b/Build/source/libs/icu/TLpatches/patch-10-ES @@ -0,0 +1,16 @@ + Otherwise fails on x86_64-solaris(10) due to (crazy?) + system definition of registers. + https://tug.org/pipermail/tlbuild/2020q1/004599.html + https://tug.org/pipermail/tlbuild/2020q1/004599.html + +--- ubidiimp.h (revision 53315) ++++ ubidiimp.h (working copy) +@@ -33,6 +33,8 @@ typedef uint32_t Flags; + is easier with the same names for the BiDi types in the code as there. + See UCharDirection in uchar.h . + */ ++#undef ES ++#undef CS + enum { + L= U_LEFT_TO_RIGHT, /* 0 */ + R= U_RIGHT_TO_LEFT, /* 1 */ diff --git a/Build/source/libs/icu/icu-src/source/common/ubidiimp.h b/Build/source/libs/icu/icu-src/source/common/ubidiimp.h index 9746b2bc103..9f822396e59 100644 --- a/Build/source/libs/icu/icu-src/source/common/ubidiimp.h +++ b/Build/source/libs/icu/icu-src/source/common/ubidiimp.h @@ -33,6 +33,8 @@ typedef uint32_t Flags; is easier with the same names for the BiDi types in the code as there. See UCharDirection in uchar.h . */ +#undef ES +#undef CS enum { L= U_LEFT_TO_RIGHT, /* 0 */ R= U_RIGHT_TO_LEFT, /* 1 */ |