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
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
