From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Oct 2019 14:47:05 +0000 (-0400)
Subject: Apparently coccinelle can't handle multiline #errors.
X-Git-Tag: tor-0.4.3.1-alpha~262^2~1^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1e8e5bb3223b950f79bce5bd3540566fc1fdc7b;p=thirdparty%2Ftor.git

Apparently coccinelle can't handle multiline #errors.
---

diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c
index 9ec59e7c81..917ef4597b 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
diff --git a/src/lib/log/log.h b/src/lib/log/log.h
index c4a27782c3..c2b20fc228 100644
--- a/src/lib/log/log.h
+++ b/src/lib/log/log.h
@@ -23,9 +23,11 @@
 #include <syslog.h>
 #define LOG_WARN LOG_WARNING
 #if LOG_DEBUG < LOG_ERR
+#ifndef COCCI
 #error "Your syslog.h thinks high numbers are more important.  " \
        "We aren't prepared to deal with that."
 #endif
+#endif
 #else /* !(defined(HAVE_SYSLOG_H)) */
 /* Note: Syslog's logging code refers to priorities, with 0 being the most
  * important.  Thus, all our comparisons needed to be reversed when we added