diff options
Diffstat (limited to 'build/build_config.h')
| -rw-r--r-- | build/build_config.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/build_config.h b/build/build_config.h index 1e9745f..9597eb4 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -17,6 +17,8 @@ // A set of macros to use for platform detection. #if defined(__APPLE__) #define OS_MACOSX 1 +#elif defined(__native_client__) +#define OS_NACL 1 #elif defined(__linux__) #define OS_LINUX 1 // Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined. @@ -66,7 +68,11 @@ // 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) || \ +<<<<<<< HEAD defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(ANDROID) +======= + defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_NACL) +>>>>>>> chromium.org at r66597 #define OS_POSIX 1 // Use base::DataPack for name/value pairs. #define USE_BASE_DATA_PACK 1 |