summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-10-09 10:16:08 -0400
committerNick Mathewson <nickm@torproject.org>2019-10-22 09:24:25 -0400
commit630d8c7a1acda53b640b018039f7ec586e048ad7 (patch)
tree522c1852ca8bb9a4591a0af31523c13415a76e6b /src/app
parenta2bb66c3558be224f3537296ee0ebec179164f57 (diff)
downloadtor-630d8c7a1acda53b640b018039f7ec586e048ad7.tar.gz
tor-630d8c7a1acda53b640b018039f7ec586e048ad7.zip
With coccinelle, avoid includes in the middle of an expression.
Diffstat (limited to 'src/app')
-rw-r--r--src/app/config/config.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index b4bccd9351..93cf5427cd 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -765,7 +765,9 @@ static const config_var_t option_vars_[] = {
/** List of default directory authorities */
static const char *default_authorities[] = {
+#ifndef COCCI
#include "auth_dirs.inc"
+#endif
NULL
};
@@ -773,7 +775,9 @@ static const char *default_authorities[] = {
* relays that meet certain stability criteria.
*/
static const char *default_fallbacks[] = {
+#ifndef COCCI
#include "fallback_dirs.inc"
+#endif
NULL
};
@@ -783,7 +787,9 @@ static const struct {
const char *k;
const char *v;
} testing_tor_network_defaults[] = {
+#ifndef COCCI
#include "testnet.inc"
+#endif
{ NULL, NULL }
};