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

Side by Side Diff: build/build_config.h

Issue 10697053: Fix OS_IOS definition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months 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 | no next file » | 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 13
14 #ifndef BUILD_BUILD_CONFIG_H_ 14 #ifndef BUILD_BUILD_CONFIG_H_
15 #define BUILD_BUILD_CONFIG_H_ 15 #define BUILD_BUILD_CONFIG_H_
16 16
17 #if defined(__APPLE__) 17 #if defined(__APPLE__)
18 #include <TargetConditionals.h> 18 #include <TargetConditionals.h>
19 #endif 19 #endif
20 20
21 // A set of macros to use for platform detection. 21 // A set of macros to use for platform detection.
22 #if defined(__APPLE__) 22 #if defined(__APPLE__)
23 #define OS_MACOSX 1 23 #define OS_MACOSX 1
24 #if defined(TARGET_OS_IPHONE) 24 #if TARGET_OS_IPHONE
25 #define OS_IOS 1 25 #define OS_IOS 1
26 #endif // defined(TARGET_OS_IPHONE) 26 #endif // TARGET_OS_IPHONE
27 #elif defined(ANDROID) 27 #elif defined(ANDROID)
28 #define OS_ANDROID 1 28 #define OS_ANDROID 1
29 #elif defined(__native_client__) 29 #elif defined(__native_client__)
30 #define OS_NACL 1 30 #define OS_NACL 1
31 #elif defined(__linux__) 31 #elif defined(__linux__)
32 #define OS_LINUX 1 32 #define OS_LINUX 1
33 // Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined. 33 // Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined.
34 #if !defined(TOOLKIT_VIEWS) 34 #if !defined(TOOLKIT_VIEWS)
35 #define TOOLKIT_GTK 35 #define TOOLKIT_GTK
36 #endif 36 #endif
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 #if defined(OS_ANDROID) 151 #if defined(OS_ANDROID)
152 // The compiler thinks std::string::const_iterator and "const char*" are 152 // The compiler thinks std::string::const_iterator and "const char*" are
153 // equivalent types. 153 // equivalent types.
154 #define STD_STRING_ITERATOR_IS_CHAR_POINTER 154 #define STD_STRING_ITERATOR_IS_CHAR_POINTER
155 // The compiler thinks base::string16::const_iterator and "char16*" are 155 // The compiler thinks base::string16::const_iterator and "char16*" are
156 // equivalent types. 156 // equivalent types.
157 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER 157 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER
158 #endif 158 #endif
159 159
160 #endif // BUILD_BUILD_CONFIG_H_ 160 #endif // BUILD_BUILD_CONFIG_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698