Chromium Code Reviews| Index: build/build_config.h |
| diff --git a/build/build_config.h b/build/build_config.h |
| index fd5489f6459bedf3045a19cc3887821144a9eef6..cfe00ad18db0ec1d68b2903c285df41883bfe736 100644 |
| --- a/build/build_config.h |
| +++ b/build/build_config.h |
| @@ -49,6 +49,8 @@ |
| #endif |
| #elif defined(_WIN32) |
| #define OS_WIN 1 |
| +#elif defined(__Fuchsia__) |
| +#define OS_FUCHSIA 1 |
| #elif defined(__FreeBSD__) |
| #define OS_FREEBSD 1 |
| #elif defined(__NetBSD__) |
| @@ -75,10 +77,10 @@ |
| // For access to standard POSIXish features, use OS_POSIX instead of a |
| // more specific macro. |
| -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ |
| - defined(OS_NETBSD) || defined(OS_OPENBSD) || defined(OS_SOLARIS) || \ |
|
scottmg
2017/03/29 22:53:17
We wanted to be really sure about BSD, Solaris, an
|
| - defined(OS_ANDROID) || defined(OS_OPENBSD) || defined(OS_SOLARIS) || \ |
| - defined(OS_ANDROID) || defined(OS_NACL) || defined(OS_QNX) |
| +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ |
| + defined(OS_NETBSD) || defined(OS_OPENBSD) || defined(OS_SOLARIS) || \ |
| + defined(OS_ANDROID) || defined(OS_NACL) || defined(OS_QNX) || \ |
| + defined(OS_FUCHSIA) |
| #define OS_POSIX 1 |
| #endif |
| @@ -168,12 +170,10 @@ |
| // Type detection for wchar_t. |
| #if defined(OS_WIN) |
| #define WCHAR_T_IS_UTF16 |
| -#elif defined(OS_POSIX) && defined(COMPILER_GCC) && \ |
| - defined(__WCHAR_MAX__) && \ |
| +#elif defined(OS_POSIX) && defined(COMPILER_GCC) && defined(__WCHAR_MAX__) && \ |
| (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff) |
| #define WCHAR_T_IS_UTF32 |
| -#elif defined(OS_POSIX) && defined(COMPILER_GCC) && \ |
| - defined(__WCHAR_MAX__) && \ |
| +#elif defined(OS_POSIX) && defined(COMPILER_GCC) && defined(__WCHAR_MAX__) && \ |
| (__WCHAR_MAX__ == 0x7fff || __WCHAR_MAX__ == 0xffff) |
| // On Posix, we'll detect short wchar_t, but projects aren't guaranteed to |
| // compile in this mode (in particular, Chrome doesn't). This is intended for |