diff options
| author | robert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 00:06:16 +0000 |
|---|---|---|
| committer | robert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 00:06:16 +0000 |
| commit | e37e88a0c9d8cd3a3dba3b4d8e2af0981a325206 (patch) | |
| tree | ebb143dca4d6fb60cedf92760c3b112e2b9ace32 /build/build_config.h | |
| parent | 8d96d62d772beae3eda5bef6f2184074651d9c90 (diff) | |
| download | chromium_src-e37e88a0c9d8cd3a3dba3b4d8e2af0981a325206.zip chromium_src-e37e88a0c9d8cd3a3dba3b4d8e2af0981a325206.tar.gz chromium_src-e37e88a0c9d8cd3a3dba3b4d8e2af0981a325206.tar.bz2 | |
define OS_BSD on *BSD and replace the ifdefs to use that
BUG=
TEST=compile
Review URL: http://codereview.chromium.org/8564020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/build_config.h')
| -rw-r--r-- | build/build_config.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/build/build_config.h b/build/build_config.h index 3dc75d6..97b0b5a 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -43,15 +43,16 @@ #error Please add support for your platform in build/build_config.h #endif -#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \ - defined(OS_SOLARIS) -#define USE_X11 1 // Use X for graphics. -#endif - #if defined(USE_OPENSSL) && defined(USE_NSS) #error Cannot use both OpenSSL and NSS #endif +// For access to standard BSD features, use OS_BSD instead of a +// more specific macro. +#if defined(OS_FREEBSD) || defined(OS_OPENBSD) +#define OS_BSD 1 +#endif + // 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) || \ @@ -60,6 +61,11 @@ #define OS_POSIX 1 #endif +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ + !defined(OS_NACL) +#define USE_X11 1 // Use X for graphics. +#endif + // Use tcmalloc #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(NO_TCMALLOC) #define USE_TCMALLOC 1 |