Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(633)

Side by Side Diff: trunk/src/build/build_config.h

Issue 107643002: Revert 239102 "Move build/build_config_functions.h to sandbox/" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/build/build_config_functions.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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.
13 16
14 #ifndef BUILD_BUILD_CONFIG_H_ 17 #ifndef BUILD_BUILD_CONFIG_H_
15 #define BUILD_BUILD_CONFIG_H_ 18 #define BUILD_BUILD_CONFIG_H_
16 19
17 #if defined(__APPLE__) 20 #if defined(__APPLE__)
18 #include <TargetConditionals.h> 21 #include <TargetConditionals.h>
19 #endif 22 #endif
20 23
21 // A set of macros to use for platform detection. 24 // A set of macros to use for platform detection.
22 #if defined(ANDROID) 25 #if defined(ANDROID)
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 #if defined(OS_ANDROID) 149 #if defined(OS_ANDROID)
147 // The compiler thinks std::string::const_iterator and "const char*" are 150 // The compiler thinks std::string::const_iterator and "const char*" are
148 // equivalent types. 151 // equivalent types.
149 #define STD_STRING_ITERATOR_IS_CHAR_POINTER 152 #define STD_STRING_ITERATOR_IS_CHAR_POINTER
150 // The compiler thinks base::string16::const_iterator and "char16*" are 153 // The compiler thinks base::string16::const_iterator and "char16*" are
151 // equivalent types. 154 // equivalent types.
152 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER 155 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER
153 #endif 156 #endif
154 157
155 #endif // BUILD_BUILD_CONFIG_H_ 158 #endif // BUILD_BUILD_CONFIG_H_
OLDNEW
« no previous file with comments | « no previous file | trunk/src/build/build_config_functions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698