build/build_config.h - Issue 1124763003: Update from https://crrev.com/327068

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/build_config.h

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 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:

Index: build/build_config.h

diff --git a/build/build_config.h b/build/build_config.h

index b07660db412f654fae64e622a26f0cc02c7fbd27..d8c3db6ed781791bd8f37dc9cb28511fe5f553c4 100644

--- a/build/build_config.h

+++ b/build/build_config.h

@@ -61,8 +61,8 @@

#error Please add support for your platform in build/build_config.h

#endif

-#if defined(USE_OPENSSL) && defined(USE_NSS)

-#error Cannot use both OpenSSL and NSS

+#if defined(USE_OPENSSL_CERTS) && defined(USE_NSS_CERTS)

+#error Cannot use both OpenSSL and NSS for certificates

#endif

// For access to standard BSD features, use OS_BSD instead of a