diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-09 10:16:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:24:25 -0400 |
| commit | 630d8c7a1acda53b640b018039f7ec586e048ad7 (patch) | |
| tree | 522c1852ca8bb9a4591a0af31523c13415a76e6b /src/lib | |
| parent | a2bb66c3558be224f3537296ee0ebec179164f57 (diff) | |
| download | tor-630d8c7a1acda53b640b018039f7ec586e048ad7.tar.gz tor-630d8c7a1acda53b640b018039f7ec586e048ad7.zip | |
With coccinelle, avoid includes in the middle of an expression.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/tls/tortls_openssl.c | 2 | ||||
| -rw-r--r-- | src/lib/version/git_revision.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index 86f0ac42cc..42db05460e 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -464,7 +464,9 @@ static const char UNRESTRICTED_SERVER_CIPHER_LIST[] = /** List of ciphers that clients should advertise, omitting items that * our OpenSSL doesn't know about. */ static const char CLIENT_CIPHER_LIST[] = +#ifndef COCCI #include "lib/tls/ciphers.inc" +#endif /* Tell it not to use SSLv2 ciphers, so that it can select an SSLv3 version * of any cipher we say. */ "!SSLv2" diff --git a/src/lib/version/git_revision.c b/src/lib/version/git_revision.c index 900a1e12a0..338ba2bc3d 100644 --- a/src/lib/version/git_revision.c +++ b/src/lib/version/git_revision.c @@ -11,14 +11,18 @@ * src/core/include.am, and is usually right. */ const char tor_git_revision[] = +#ifndef COCCI #ifndef _MSC_VER #include "micro-revision.i" #endif +#endif ""; const char tor_bug_suffix[] = " (on Tor " VERSION +#ifndef COCCI #ifndef _MSC_VER " " #include "micro-revision.i" #endif +#endif ")"; |