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

Side by Side Diff: build/build_config.h

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs
Patch Set: rebase Created 5 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
« no previous file with comments | « no previous file | 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 // OS_NACL (NACL_SFI or NACL_NONSFI) / OS_NACL_SFI / OS_NACL_NONSFI 8 // OS_NACL (NACL_SFI or NACL_NONSFI) / OS_NACL_SFI / OS_NACL_NONSFI
9 // Compiler: 9 // Compiler:
10 // COMPILER_MSVC / COMPILER_GCC 10 // COMPILER_MSVC / COMPILER_GCC
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #elif defined(__OpenBSD__) 54 #elif defined(__OpenBSD__)
55 #define OS_OPENBSD 1 55 #define OS_OPENBSD 1
56 #elif defined(__sun) 56 #elif defined(__sun)
57 #define OS_SOLARIS 1 57 #define OS_SOLARIS 1
58 #elif defined(__QNXNTO__) 58 #elif defined(__QNXNTO__)
59 #define OS_QNX 1 59 #define OS_QNX 1
60 #else 60 #else
61 #error Please add support for your platform in build/build_config.h 61 #error Please add support for your platform in build/build_config.h
62 #endif 62 #endif
63 63
64 #if defined(USE_OPENSSL) && defined(USE_NSS) 64 #if defined(USE_OPENSSL) && defined(USE_NSS_CERTS)
65 // TODO(davidben): This constraint compares somewhat orthogonal things and will
66 // be fixed when BoringSSL with NSS for certificates is added as a build
67 // configuration. See https://crbug.com/462040.
65 #error Cannot use both OpenSSL and NSS 68 #error Cannot use both OpenSSL and NSS
66 #endif 69 #endif
67 70
68 // For access to standard BSD features, use OS_BSD instead of a 71 // For access to standard BSD features, use OS_BSD instead of a
69 // more specific macro. 72 // more specific macro.
70 #if defined(OS_FREEBSD) || defined(OS_OPENBSD) 73 #if defined(OS_FREEBSD) || defined(OS_OPENBSD)
71 #define OS_BSD 1 74 #define OS_BSD 1
72 #endif 75 #endif
73 76
74 // For access to standard POSIXish features, use OS_POSIX instead of a 77 // For access to standard POSIXish features, use OS_POSIX instead of a
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 #if defined(OS_ANDROID) 162 #if defined(OS_ANDROID)
160 // The compiler thinks std::string::const_iterator and "const char*" are 163 // The compiler thinks std::string::const_iterator and "const char*" are
161 // equivalent types. 164 // equivalent types.
162 #define STD_STRING_ITERATOR_IS_CHAR_POINTER 165 #define STD_STRING_ITERATOR_IS_CHAR_POINTER
163 // The compiler thinks base::string16::const_iterator and "char16*" are 166 // The compiler thinks base::string16::const_iterator and "char16*" are
164 // equivalent types. 167 // equivalent types.
165 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER 168 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER
166 #endif 169 #endif
167 170
168 #endif // BUILD_BUILD_CONFIG_H_ 171 #endif // BUILD_BUILD_CONFIG_H_
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698