[Libreoffice-commits] core.git: icu/icu4c-android.patch

[Tor Lillqvist]

 icu/icu4c-android.patch |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 75ba64a2906a99d82a469abca8bcec38c56bb055
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Mar 30 20:42:57 2013 +0200

    Adapt the patch to apply to ICU 51.1
    
    Change-Id: Ic6771c4ae12686580301e114fa5aec7f7d4dc9a8

diff --git a/icu/icu4c-android.patch b/icu/icu4c-android.patch
index 2d079a0..55764a1 100644
--- a/icu/icu4c-android.patch
+++ b/icu/icu4c-android.patch
@@ -17,7 +17,7 @@
  	fi ;;
 -*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
 +*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu|*-*-*-androideabi*) icu_cv_host_frag=mh-linux ;;
- *-*-cygwin|*-*-mingw32)
+ *-*-cygwin|*-*-mingw32|*-*-mingw64)
  	if test "$GCC" = yes; then
  		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 @@ -6127,6 +6127,9 @@
@@ -52,15 +52,6 @@
  #else
  #   define U_HAVE_NL_LANGINFO_CODESET 1
  #endif
-@@ -114,6 +114,8 @@
- 
- #ifdef U_TIMEZONE
-     /* Use the predefined value. */
-+#elif defined(__ANDROID__)
-+#   define U_TIMEZONE timezone
- #elif U_PLATFORM_IS_LINUX_BASED
- #   define U_TIMEZONE __timezone
- #elif U_PLATFORM_USES_ONLY_WIN32_API
 --- misc/icu/source/common/unicode/platform.h
 +++ misc/build/icu/source/common/unicode/platform.h
 @@ -641,7 +641,7 @@