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

Side by Side Diff: build/build_config.h

Issue 238633004: Remove all uses of toolkit_use_gtk in the gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 8 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 | « build/all.gyp ('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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #elif defined(__OpenBSD__) 42 #elif defined(__OpenBSD__)
43 #define OS_OPENBSD 1 43 #define OS_OPENBSD 1
44 #elif defined(__sun) 44 #elif defined(__sun)
45 #define OS_SOLARIS 1 45 #define OS_SOLARIS 1
46 #elif defined(__QNXNTO__) 46 #elif defined(__QNXNTO__)
47 #define OS_QNX 1 47 #define OS_QNX 1
48 #else 48 #else
49 #error Please add support for your platform in build/build_config.h 49 #error Please add support for your platform in build/build_config.h
50 #endif 50 #endif
51 51
52 // Use TOOLKIT_GTK on X11 if TOOLKIT_VIEWS and USE_AURA aren't defined.
53 #if defined(USE_X11) && !defined(TOOLKIT_VIEWS) && !defined(USE_AURA) && \
54 !defined(OS_NACL)
55 #define TOOLKIT_GTK
56 #endif
57
58 #if defined(USE_OPENSSL) && defined(USE_NSS) 52 #if defined(USE_OPENSSL) && defined(USE_NSS)
59 #error Cannot use both OpenSSL and NSS 53 #error Cannot use both OpenSSL and NSS
60 #endif 54 #endif
61 55
62 // For access to standard BSD features, use OS_BSD instead of a 56 // For access to standard BSD features, use OS_BSD instead of a
63 // more specific macro. 57 // more specific macro.
64 #if defined(OS_FREEBSD) || defined(OS_OPENBSD) 58 #if defined(OS_FREEBSD) || defined(OS_OPENBSD)
65 #define OS_BSD 1 59 #define OS_BSD 1
66 #endif 60 #endif
67 61
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 #if defined(OS_ANDROID) 146 #if defined(OS_ANDROID)
153 // The compiler thinks std::string::const_iterator and "const char*" are 147 // The compiler thinks std::string::const_iterator and "const char*" are
154 // equivalent types. 148 // equivalent types.
155 #define STD_STRING_ITERATOR_IS_CHAR_POINTER 149 #define STD_STRING_ITERATOR_IS_CHAR_POINTER
156 // The compiler thinks base::string16::const_iterator and "char16*" are 150 // The compiler thinks base::string16::const_iterator and "char16*" are
157 // equivalent types. 151 // equivalent types.
158 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER 152 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER
159 #endif 153 #endif
160 154
161 #endif // BUILD_BUILD_CONFIG_H_ 155 #endif // BUILD_BUILD_CONFIG_H_
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698