diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:39:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:39:06 -0400 |
| commit | b2d487ae2249a307cd23255dbb1a22241eefd6ef (patch) | |
| tree | cd754fbe8d1c13264749f997f1221b1635a97e49 /src/lib/crypt_ops | |
| parent | 2d013bbe5cccaccf9ace0beec5a987fb80e850ad (diff) | |
| parent | 7e7a4874b8fa333d1840cc5f2c0b118d6a0e7c47 (diff) | |
| download | tor-b2d487ae2249a307cd23255dbb1a22241eefd6ef.tar.gz tor-b2d487ae2249a307cd23255dbb1a22241eefd6ef.zip | |
Merge branch 'ticket31705_v2' into ticket31705_v2_merged
Conflicts:
src/feature/dirparse/authcert_parse.c
src/feature/dirparse/ns_parse.c
src/feature/hs/hs_service.c
src/lib/conf/conftesting.h
src/lib/log/log.h
src/lib/thread/threads.h
src/test/test_options.c
These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.
Diffstat (limited to 'src/lib/crypt_ops')
| -rw-r--r-- | src/lib/crypt_ops/crypto_openssl_mgt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c index f51309219a..617c0dcd76 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.c +++ b/src/lib/crypt_ops/crypto_openssl_mgt.c @@ -121,9 +121,11 @@ crypto_openssl_get_header_version_str(void) return crypto_openssl_header_version_str; } +#ifndef COCCI #ifndef OPENSSL_THREADS -#error OpenSSL has been built without thread support. Tor requires an \ - OpenSSL library with thread support enabled. +#error "OpenSSL has been built without thread support. Tor requires an \ + OpenSSL library with thread support enabled." +#endif #endif #ifndef NEW_THREAD_API |