| 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: |
| 11 // ARCH_CPU_X86 / ARCH_CPU_X86_64 / ARCH_CPU_X86_FAMILY (X86 or X86_64) | 11 // ARCH_CPU_X86 / ARCH_CPU_X86_64 / ARCH_CPU_X86_FAMILY (X86 or X86_64) |
| 12 // ARCH_CPU_32_BITS / ARCH_CPU_64_BITS | 12 // ARCH_CPU_32_BITS / ARCH_CPU_64_BITS |
| 13 // | |
| 14 // If an #ifdef is not strictly necessary, please consider using | |
| 15 // build/build_config_functions.h instead. | |
| 16 | 13 |
| 17 #ifndef BUILD_BUILD_CONFIG_H_ | 14 #ifndef BUILD_BUILD_CONFIG_H_ |
| 18 #define BUILD_BUILD_CONFIG_H_ | 15 #define BUILD_BUILD_CONFIG_H_ |
| 19 | 16 |
| 20 #if defined(__APPLE__) | 17 #if defined(__APPLE__) |
| 21 #include <TargetConditionals.h> | 18 #include <TargetConditionals.h> |
| 22 #endif | 19 #endif |
| 23 | 20 |
| 24 // A set of macros to use for platform detection. | 21 // A set of macros to use for platform detection. |
| 25 #if defined(ANDROID) | 22 #if defined(ANDROID) |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 #if defined(OS_ANDROID) | 146 #if defined(OS_ANDROID) |
| 150 // The compiler thinks std::string::const_iterator and "const char*" are | 147 // The compiler thinks std::string::const_iterator and "const char*" are |
| 151 // equivalent types. | 148 // equivalent types. |
| 152 #define STD_STRING_ITERATOR_IS_CHAR_POINTER | 149 #define STD_STRING_ITERATOR_IS_CHAR_POINTER |
| 153 // The compiler thinks base::string16::const_iterator and "char16*" are | 150 // The compiler thinks base::string16::const_iterator and "char16*" are |
| 154 // equivalent types. | 151 // equivalent types. |
| 155 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER | 152 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER |
| 156 #endif | 153 #endif |
| 157 | 154 |
| 158 #endif // BUILD_BUILD_CONFIG_H_ | 155 #endif // BUILD_BUILD_CONFIG_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 108013002:
Revert of Add build_config_functions.h to avoid #ifdef (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src