Add some missing includes and struct declarations.

diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index 753c42b80936aa27a0858dc84a3d57207b2897ae..2a48a32834781a1815c4dee76b0f25a21f858533 100644 (file)
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -15,6 +15,7 @@
 #include "feature/nodelist/parsecommon.h"
 #include "core/or/policies.h"
 #include "core/or/protover.h"
+#include "core/or/tor_version_st.h"
 #include "feature/stats/rephist.h"
 #include "feature/relay/router.h"
 #include "feature/relay/routerkeys.h"

diff --git a/src/feature/dircache/dirserv.h b/src/feature/dircache/dirserv.h
index d399c410904e98a5686b21ff401d02dd4ef3dcc4..b1b8cee5fcc0fc9f270f2f131c876a37ab8bb971 100644 (file)
--- a/src/feature/dircache/dirserv.h
+++ b/src/feature/dircache/dirserv.h
@@ -180,7 +180,9 @@ char *routerstatus_format_entry(
 void dirserv_free_all(void);
 void cached_dir_decref(cached_dir_t *d);
 cached_dir_t *new_cached_dir(char *s, time_t published);
-char *format_recommended_version_list(const config_line_t *line, int warn);
+struct config_line_t;
+char *format_recommended_version_list(const struct config_line_t *line,
+                                      int warn);
 int validate_recommended_package_line(const char *line);
 int dirserv_query_measured_bw_cache_kb(const char *node_id,
                                        long *bw_out,

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 4396d819c81af40eef7dfb3f5a9e17f0825d0cb5..92917723e098c9b2015bc04b8cf6f30eb4e68288 100644 (file)
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -23,6 +23,7 @@
 #include "app/config/confparse.h"
 #include "app/config/config.h"
 #include "feature/control/control.h"
+#include "lib/encoding/confline.h"
 #include "lib/crypt_ops/crypto_ed25519.h"
 #include "lib/crypt_ops/crypto_format.h"
 #include "lib/crypt_ops/crypto_rand.h"