Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(585)

Unified Diff: patches/putil.patch

Issue 822213003: ICU upgrade to 54.1 step 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: readme: better wrapping, declspec patch dropped Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « patches/platform_nacl.patch ('k') | patches/regex.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patches/putil.patch
diff --git a/patches/putil.patch b/patches/putil.patch
deleted file mode 100644
index a6be1e16fe03cddaf6a2a0811d0e274b912a4243..0000000000000000000000000000000000000000
--- a/patches/putil.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: source/common/putilimp.h
-===================================================================
---- source/common/putilimp.h (revision 259715)
-+++ source/common/putilimp.h (working copy)
-@@ -85,7 +85,7 @@
-
- #ifdef U_HAVE_NL_LANGINFO_CODESET
- /* Use the predefined value. */
--#elif U_PLATFORM_HAS_WIN32_API
-+#elif U_PLATFORM_HAS_WIN32_API || U_PLATFORM == U_PF_ANDROID || U_PLATFORM == U_PF_QNX
- # define U_HAVE_NL_LANGINFO_CODESET 0
- #else
- # define U_HAVE_NL_LANGINFO_CODESET 1
-@@ -116,9 +116,12 @@
- #elif U_PLATFORM == U_PF_ANDROID
- # define U_TIMEZONE timezone
- #elif U_PLATFORM_IS_LINUX_BASED
--# if !defined(__UCLIBC__)
-- /* __timezone is only available in glibc */
--# define U_TIMEZONE __timezone
-+# if defined(__UCLIBC__)
-+ /* uClibc does not have __timezone or _timezone. */
-+# elif defined(_NEWLIB_VERSION)
-+# define U_TIMEZONE _timezone
-+# elif defined(__GLIBC__)
-+# define U_TIMEZONE __timezone
- # endif
- #elif U_PLATFORM_USES_ONLY_WIN32_API
- # define U_TIMEZONE _timezone
« no previous file with comments | « patches/platform_nacl.patch ('k') | patches/regex.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698