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

Side by Side Diff: build/build_config.h

Issue 14624010: Change MessagePumpLinux to MessagePumpOzone (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | « base/message_pump_ozone.cc ('k') | build/common.gypi » ('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:
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #endif 61 #endif
62 62
63 // For access to standard POSIXish features, use OS_POSIX instead of a 63 // For access to standard POSIXish features, use OS_POSIX instead of a
64 // more specific macro. 64 // more specific macro.
65 #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ 65 #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \
66 defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \ 66 defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \
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) && \
72 !defined(OS_NACL) && !defined(USE_MESSAGEPUMP_LINUX)
73 #define USE_X11 1 // Use X for graphics.
74 #endif
75
76 // Use tcmalloc 71 // Use tcmalloc
77 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(NO_TCMALLOC) 72 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(NO_TCMALLOC)
78 #define USE_TCMALLOC 1 73 #define USE_TCMALLOC 1
79 #endif 74 #endif
80 75
81 // Compiler detection. 76 // Compiler detection.
82 #if defined(__GNUC__) 77 #if defined(__GNUC__)
83 #define COMPILER_GCC 1 78 #define COMPILER_GCC 1
84 #elif defined(_MSC_VER) 79 #elif defined(_MSC_VER)
85 #define COMPILER_MSVC 1 80 #define COMPILER_MSVC 1
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 #if defined(OS_ANDROID) 140 #if defined(OS_ANDROID)
146 // The compiler thinks std::string::const_iterator and "const char*" are 141 // The compiler thinks std::string::const_iterator and "const char*" are
147 // equivalent types. 142 // equivalent types.
148 #define STD_STRING_ITERATOR_IS_CHAR_POINTER 143 #define STD_STRING_ITERATOR_IS_CHAR_POINTER
149 // The compiler thinks base::string16::const_iterator and "char16*" are 144 // The compiler thinks base::string16::const_iterator and "char16*" are
150 // equivalent types. 145 // equivalent types.
151 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER 146 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER
152 #endif 147 #endif
153 148
154 #endif // BUILD_BUILD_CONFIG_H_ 149 #endif // BUILD_BUILD_CONFIG_H_
OLDNEW
« no previous file with comments | « base/message_pump_ozone.cc ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698