| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 defined(OS_NACL) | 67 defined(OS_NACL) |
| 68 #define OS_POSIX 1 | 68 #define OS_POSIX 1 |
| 69 #endif | 69 #endif |
| 70 | 70 |
| 71 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ | 71 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ |
| 72 !defined(OS_NACL) && !defined(USE_MESSAGEPUMP_LINUX) | 72 !defined(OS_NACL) && !defined(USE_MESSAGEPUMP_LINUX) |
| 73 #define USE_X11 1 // Use X for graphics. | 73 #define USE_X11 1 // Use X for graphics. |
| 74 #endif | 74 #endif |
| 75 | 75 |
| 76 // Use tcmalloc | 76 // Use tcmalloc |
| 77 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(NO_TCMALLOC) | 77 #if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)) && \ |
| 78 !defined(NO_TCMALLOC) |
| 78 #define USE_TCMALLOC 1 | 79 #define USE_TCMALLOC 1 |
| 79 #endif | 80 #endif |
| 80 | 81 |
| 81 // Compiler detection. | 82 // Compiler detection. |
| 82 #if defined(__GNUC__) | 83 #if defined(__GNUC__) |
| 83 #define COMPILER_GCC 1 | 84 #define COMPILER_GCC 1 |
| 84 #elif defined(_MSC_VER) | 85 #elif defined(_MSC_VER) |
| 85 #define COMPILER_MSVC 1 | 86 #define COMPILER_MSVC 1 |
| 86 #else | 87 #else |
| 87 #error Please add support for your compiler in build/build_config.h | 88 #error Please add support for your compiler in build/build_config.h |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 #if defined(OS_ANDROID) | 146 #if defined(OS_ANDROID) |
| 146 // The compiler thinks std::string::const_iterator and "const char*" are | 147 // The compiler thinks std::string::const_iterator and "const char*" are |
| 147 // equivalent types. | 148 // equivalent types. |
| 148 #define STD_STRING_ITERATOR_IS_CHAR_POINTER | 149 #define STD_STRING_ITERATOR_IS_CHAR_POINTER |
| 149 // The compiler thinks base::string16::const_iterator and "char16*" are | 150 // The compiler thinks base::string16::const_iterator and "char16*" are |
| 150 // equivalent types. | 151 // equivalent types. |
| 151 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER | 152 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER |
| 152 #endif | 153 #endif |
| 153 | 154 |
| 154 #endif // BUILD_BUILD_CONFIG_H_ | 155 #endif // BUILD_BUILD_CONFIG_H_ |
| OLD | NEW |