| Index: source/common/unicode/platform.h
|
| diff --git a/source/common/unicode/platform.h b/source/common/unicode/platform.h
|
| index 4ca0f2f45765b9bb3e0f88fb6ac8172681e57c69..07dce8adf07a99920b5a8e6062a9b18f0c4ff279 100644
|
| --- a/source/common/unicode/platform.h
|
| +++ b/source/common/unicode/platform.h
|
| @@ -1,7 +1,7 @@
|
| /*
|
| ******************************************************************************
|
| *
|
| -* Copyright (C) 1997-2013, International Business Machines
|
| +* Copyright (C) 1997-2014, International Business Machines
|
| * Corporation and others. All Rights Reserved.
|
| *
|
| ******************************************************************************
|
| @@ -121,12 +121,8 @@
|
| #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 4100
|
| -/** "Classic" Mac OS (1984-2001) @internal */
|
| -#define U_PF_CLASSIC_MACOS 8000
|
| +#define U_PF_ANDROID 4050
|
| /** 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 */
|
| @@ -144,8 +140,6 @@
|
| # 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__)
|
| @@ -173,8 +167,6 @@
|
| # define U_PLATFORM U_PF_HPUX
|
| #elif defined(sgi) || defined(__sgi)
|
| # define U_PLATFORM U_PF_IRIX
|
| -#elif defined(macintosh)
|
| -# define U_PLATFORM U_PF_CLASSIC_MACOS
|
| #elif defined(__QNX__) || defined(__QNXNTO__)
|
| # define U_PLATFORM U_PF_QNX
|
| #elif defined(__TOS_MVS__)
|
| @@ -234,7 +226,7 @@
|
| */
|
| #ifdef U_PLATFORM_IMPLEMENTS_POSIX
|
| /* Use the predefined value. */
|
| -#elif U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CLASSIC_MACOS
|
| +#elif U_PLATFORM_USES_ONLY_WIN32_API
|
| # define U_PLATFORM_IMPLEMENTS_POSIX 0
|
| #else
|
| # define U_PLATFORM_IMPLEMENTS_POSIX 1
|
| @@ -583,7 +575,7 @@
|
| */
|
| #ifdef U_SIZEOF_WCHAR_T
|
| /* Use the predefined value. */
|
| -#elif (U_PLATFORM == U_PF_ANDROID && __ANDROID_API__ < 9) || U_PLATFORM == U_PF_CLASSIC_MACOS
|
| +#elif (U_PLATFORM == U_PF_ANDROID && __ANDROID_API__ < 9)
|
| /*
|
| * Classic Mac OS and Mac OS X before 10.3 (Panther) did not support wchar_t or wstring.
|
| * Newer Mac OS X has size 4.
|
|
|