ICU upgrade to 54.1 step 2

source/common/unicode/platform.h

 /*
 ******************************************************************************
 *
 *   Copyright (C) 1997-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *
 *  FILE NAME : platform.h
 *
@@ skipping 103 matching lines @@
  * (Original description modified from WikiPedia.)
  * @internal
  */
 #define U_PF_DARWIN 3500
 /** iPhone OS (iOS) is a derivative of Mac OS X. @internal */
 #define U_PF_IPHONE 3550
 /** QNX is a commercial Unix-like real-time operating system related to BSD. @internal */
 #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 */
 #define U_PF_OS400 9400
 
 #ifdef U_PLATFORM
     /* Use the predefined value. */
 #elif defined(__MINGW32__)
 #   define U_PLATFORM U_PF_MINGW
 #elif defined(__CYGWIN__)
 #   define U_PLATFORM U_PF_CYGWIN
 #elif defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
 #   define U_PLATFORM U_PF_WINDOWS
 #elif defined(__ANDROID__)
 #   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__)
 #   include <TargetConditionals.h>
 #   if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE  /* variant of TARGET_OS_MAC */
 #       define U_PLATFORM U_PF_IPHONE
 #   else
 #       define U_PLATFORM U_PF_DARWIN
 #   endif
 #elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)
@@ skipping 589 matching lines @@
  */
 #if U_PLATFORM == U_PF_OS390 && defined(__cplusplus)
 #    define U_CALLCONV __cdecl
 #else
 #    define U_CALLCONV U_EXPORT2
 #endif
 
 /* @} */
 
 #endif