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

Unified Diff: source/common/unicode/platform.h

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 | « source/common/udata.cpp ('k') | source/common/unicode/utypes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/unicode/platform.h
diff --git a/source/common/unicode/platform.h b/source/common/unicode/platform.h
index 07dce8adf07a99920b5a8e6062a9b18f0c4ff279..0b40fed21e0e3d767d238094e4f1d93284f4c4b9 100644
--- a/source/common/unicode/platform.h
+++ b/source/common/unicode/platform.h
@@ -121,8 +121,10 @@
#define U_PF_QNX 3700
/** Linux is a Unix-like operating system. @internal */
#define U_PF_LINUX 4000
+/** Native Client is pretty close to Linux. @internal */
+#define U_PF_NATIVE_CLIENT 4050
/** Android is based on Linux. @internal */
-#define U_PF_ANDROID 4050
+#define U_PF_ANDROID 4100
/** z/OS is the successor to OS/390 which was the successor to MVS. @internal */
#define U_PF_OS390 9000
/** "IBM i" is the current name of what used to be i5/OS and earlier OS/400. @internal */
@@ -140,6 +142,8 @@
# define U_PLATFORM U_PF_ANDROID
/* Android wchar_t support depends on the API level. */
# include <android/api-level.h>
+#elif defined(__native_client__)
+# define U_PLATFORM U_PF_NATIVE_CLIENT
#elif defined(linux) || defined(__linux__) || defined(__linux)
# define U_PLATFORM U_PF_LINUX
#elif defined(__APPLE__) && defined(__MACH__)
« no previous file with comments | « source/common/udata.cpp ('k') | source/common/unicode/utypes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698