| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // This file adds defines about the platform we're currently building on. | 5 // This file adds defines about the platform we're currently building on. |
| 6 // Operating System: | 6 // Operating System: |
| 7 // OS_WIN / OS_MACOSX / OS_LINUX / OS_POSIX (MACOSX or LINUX) | 7 // OS_WIN / OS_MACOSX / OS_LINUX / OS_POSIX (MACOSX or LINUX) |
| 8 // Compiler: | 8 // Compiler: |
| 9 // COMPILER_MSVC / COMPILER_GCC | 9 // COMPILER_MSVC / COMPILER_GCC |
| 10 // Processor: | 10 // Processor: |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #define TOOLKIT_GTK | 38 #define TOOLKIT_GTK |
| 39 #elif defined(__sun) | 39 #elif defined(__sun) |
| 40 #define OS_SOLARIS 1 | 40 #define OS_SOLARIS 1 |
| 41 #define TOOLKIT_GTK | 41 #define TOOLKIT_GTK |
| 42 #else | 42 #else |
| 43 #error Please add support for your platform in build/build_config.h | 43 #error Please add support for your platform in build/build_config.h |
| 44 #endif | 44 #endif |
| 45 | 45 |
| 46 // A flag derived from the above flags, used to cover GTK code in | 46 // A flag derived from the above flags, used to cover GTK code in |
| 47 // both TOOLKIT_GTK and TOOLKIT_VIEWS. | 47 // both TOOLKIT_GTK and TOOLKIT_VIEWS. |
| 48 #if defined(TOOLKIT_GTK) || (defined(TOOLKIT_VIEWS) && !defined(OS_WIN) && !defi
ned(USE_AURA)) | 48 #if defined(TOOLKIT_GTK) || (defined(TOOLKIT_VIEWS) && !defined(OS_WIN)) |
| 49 #define TOOLKIT_USES_GTK 1 | 49 #define TOOLKIT_USES_GTK 1 |
| 50 #endif | 50 #endif |
| 51 | 51 |
| 52 #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \ | 52 #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \ |
| 53 defined(OS_SOLARIS) || defined(OS_ANDROID) | 53 defined(OS_SOLARIS) || defined(OS_ANDROID) |
| 54 #if !defined(USE_OPENSSL) | 54 #if !defined(USE_OPENSSL) |
| 55 #define USE_NSS 1 // Default to use NSS for crypto, unless OpenSSL is chosen. | 55 #define USE_NSS 1 // Default to use NSS for crypto, unless OpenSSL is chosen. |
| 56 #endif | 56 #endif |
| 57 #ifndef OS_ANDROID | 57 #ifndef OS_ANDROID |
| 58 #define USE_X11 1 // Use X for graphics. | 58 #define USE_X11 1 // Use X for graphics. |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 #if defined(OS_ANDROID) | 144 #if defined(OS_ANDROID) |
| 145 // The compiler thinks std::string::const_iterator and "const char*" are | 145 // The compiler thinks std::string::const_iterator and "const char*" are |
| 146 // equivalent types. | 146 // equivalent types. |
| 147 #define STD_STRING_ITERATOR_IS_CHAR_POINTER | 147 #define STD_STRING_ITERATOR_IS_CHAR_POINTER |
| 148 // The compiler thinks base::string16::const_iterator and "char16*" are | 148 // The compiler thinks base::string16::const_iterator and "char16*" are |
| 149 // equivalent types. | 149 // equivalent types. |
| 150 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER | 150 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER |
| 151 #endif | 151 #endif |
| 152 | 152 |
| 153 #endif // BUILD_BUILD_CONFIG_H_ | 153 #endif // BUILD_BUILD_CONFIG_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 7978007:
Revert 102005 - aura: Explicitly disable GTK. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/