Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / build / build_config.h

diff --git a/src/build/build_config.h b/src/build/build_config.h
index d8f5dd6..c384347 100644 (file)
--- a/src/build/build_config.h
+++ b/src/build/build_config.h
@@ -30,9 +30,11 @@
 #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
+#define LIBC_GLIBC 1
 #endif
 #elif defined(_WIN32)
 #define OS_WIN 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
@@ -107,7 +103,7 @@
 #define ARCH_CPU_ARMEL 1
 #define ARCH_CPU_32_BITS 1
 #define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__arm64__) || defined(__aarch64__)
+#elif defined(__aarch64__)
 #define ARCH_CPU_ARM_FAMILY 1
 #define ARCH_CPU_ARM64 1
 #define ARCH_CPU_64_BITS 1
@@ -143,12 +139,6 @@
 #error Please add support for your compiler in build/build_config.h
 #endif
 
-#if defined(__ARMEL__) && !defined(OS_IOS)
-#define WCHAR_T_IS_UNSIGNED 1
-#elif defined(__MIPSEL__)
-#define WCHAR_T_IS_UNSIGNED 0
-#endif
-
 #if defined(OS_ANDROID)
 // The compiler thinks std::string::const_iterator and "const char*" are
 // equivalent types.