summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-08-31 13:35:42 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-08-31 13:35:42 +0000
commit261f84357cc7bd6f87dba0694cf250ea00b5b513 (patch)
treeb6272406fe53655e8b2c52cc96d4fe11f1bc4047
parent0fb02de850dc4adf2178361faf05d7e22dc3e993 (diff)
ICU endian problem, ICU Ticket #8657, comment 11
git-svn-id: svn://tug.org/texlive/trunk@23760 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/libs/icu/icu-4.8.1-PATCHES/ChangeLog4
-rw-r--r--Build/source/libs/icu/icu-4.8.1-PATCHES/patch-40-LESwaps16
-rw-r--r--Build/source/libs/icu/icu-4.8.1/layout/LESwaps.h8
3 files changed, 20 insertions, 8 deletions
diff --git a/Build/source/libs/icu/icu-4.8.1-PATCHES/ChangeLog b/Build/source/libs/icu/icu-4.8.1-PATCHES/ChangeLog
index 151146efad4..111f3557c4a 100644
--- a/Build/source/libs/icu/icu-4.8.1-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-4.8.1-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-31 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-40-LESwaps: See ICU Ticket #8657, comment 11.
+
2011-08-09 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported icu-4.8.1 source tree (icu4c-4_8_1-src.tgz) from:
diff --git a/Build/source/libs/icu/icu-4.8.1-PATCHES/patch-40-LESwaps b/Build/source/libs/icu/icu-4.8.1-PATCHES/patch-40-LESwaps
index 084127d6b10..6f0c1ad3b4b 100644
--- a/Build/source/libs/icu/icu-4.8.1-PATCHES/patch-40-LESwaps
+++ b/Build/source/libs/icu/icu-4.8.1-PATCHES/patch-40-LESwaps
@@ -1,23 +1,27 @@
- See ICU Ticket #8657, comment 7.
+ See ICU Ticket #8657, comment 11.
diff -ur icu-4.8.1.orig/source/layout/LESwaps.h icu-4.8.1/source/layout/LESwaps.h
--- icu-4.8.1.orig/source/layout/LESwaps.h 2011-07-19 23:19:34.000000000 +0200
-+++ icu-4.8.1/source/layout/LESwaps.h 2011-08-09 14:19:21.327400877 +0200
-@@ -56,7 +56,7 @@
++++ icu-4.8.1/source/layout/LESwaps.h 2011-08-31 15:08:59.000000000 +0200
+@@ -56,7 +56,9 @@
*/
static le_uint16 swapWord(le_uint16 value)
{
-#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || (defined(BYTE_ORDER) && defined(BIG_ENDIAN)) || defined(__BIG_ENDIAN__)
-+#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || defined(__BIG_ENDIAN__)
++#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || \
++ (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && (BYTE_ORDER == BIG_ENDIAN)) || \
++ defined(__BIG_ENDIAN__)
// Fastpath when we know that the platform is big-endian.
return value;
#else
-@@ -78,7 +78,7 @@
+@@ -78,7 +80,9 @@
*/
static le_uint32 swapLong(le_uint32 value)
{
-#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || (defined(BYTE_ORDER) && defined(BIG_ENDIAN)) || defined(__BIG_ENDIAN__)
-+#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || defined(__BIG_ENDIAN__)
++#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || \
++ (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && (BYTE_ORDER == BIG_ENDIAN)) || \
++ defined(__BIG_ENDIAN__)
// Fastpath when we know that the platform is big-endian.
return value;
#else
diff --git a/Build/source/libs/icu/icu-4.8.1/layout/LESwaps.h b/Build/source/libs/icu/icu-4.8.1/layout/LESwaps.h
index 37fd6694bbe..b9b133f4f72 100644
--- a/Build/source/libs/icu/icu-4.8.1/layout/LESwaps.h
+++ b/Build/source/libs/icu/icu-4.8.1/layout/LESwaps.h
@@ -56,7 +56,9 @@ public:
*/
static le_uint16 swapWord(le_uint16 value)
{
-#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || defined(__BIG_ENDIAN__)
+#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || \
+ (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && (BYTE_ORDER == BIG_ENDIAN)) || \
+ defined(__BIG_ENDIAN__)
// Fastpath when we know that the platform is big-endian.
return value;
#else
@@ -78,7 +80,9 @@ public:
*/
static le_uint32 swapLong(le_uint32 value)
{
-#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || defined(__BIG_ENDIAN__)
+#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || \
+ (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && (BYTE_ORDER == BIG_ENDIAN)) || \
+ defined(__BIG_ENDIAN__)
// Fastpath when we know that the platform is big-endian.
return value;
#else