Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
diff --git a/build/build_config.h b/build/build_config.h
index e26d75e..57eb9a8 100644
--- a/build/build_config.h
+++ b/build/build_config.h
@@ -30,6 +30,8 @@
#define OS_NACL 1
#elif defined(__linux__)
#define OS_LINUX 1
+// include a system header to pull in features.h for glibc/uclibc macros.
+#include <unistd.h>
#if defined(__GLIBC__) && !defined(__UCLIBC__)
// we really are using glibc, not uClibc pretending to be glibc
#define LIBC_GLIBC 1
@@ -49,12 +51,6 @@
#error Please add support for your platform in build/build_config.h
#endif
-// Use TOOLKIT_GTK on X11 if TOOLKIT_VIEWS and USE_AURA aren't defined.
-#if defined(USE_X11) && !defined(TOOLKIT_VIEWS) && !defined(USE_AURA) && \
- !defined(OS_NACL)
-#define TOOLKIT_GTK
-#endif
-
#if defined(USE_OPENSSL) && defined(USE_NSS)
#error Cannot use both OpenSSL and NSS
#endif