From f02c7cdbef595660703cce9359fe9eb71ceefacf Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Tue, 29 Apr 2014 20:32:17 +0100 Subject: [PATCH] drop source/common/putilimp.h part of Android patch, fdo#77071 related ICU now has its (U_PLATFORM == U_PF_ANDROID) directive. Change-Id: If740ea0c8004a2a8365d46b5ecf0e388b5965f62 --- external/icu/icu4c-android.patch | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/external/icu/icu4c-android.patch b/external/icu/icu4c-android.patch index ad10fe339473..ce8c8b42230a 100644 --- a/external/icu/icu4c-android.patch +++ b/external/icu/icu4c-android.patch @@ -43,18 +43,6 @@ ;; esac ---- misc/icu/source/common/putilimp.h 2013-10-05 03:49:30.000000000 +0700 -+++ misc/build/icu/source/common/putilimp.h 2013-11-10 17:21:26.224217698 +0700 -@@ -87,6 +87,8 @@ - /* Use the predefined value. */ - #elif U_PLATFORM_HAS_WIN32_API - # define U_HAVE_NL_LANGINFO_CODESET 0 -+#elif defined(__ANDROID__) -+# define U_HAVE_NL_LANGINFO_CODESET 0 - #else - # define U_HAVE_NL_LANGINFO_CODESET 1 - #endif - --- misc/icu/source/common/unicode/platform.h 2013-10-05 03:49:10.000000000 +0700 +++ misc/build/icu/source/common/unicode/platform.h 2013-11-10 17:22:27.160217186 +0700 @@ -703,7 +703,7 @@