diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-05 16:34:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-05 17:15:50 -0400 |
| commit | ef486e3c029efe8cb18886eea52f20af766f9daa (patch) | |
| tree | 78a7553311e67f5911c102d5e7ca9b0f1eacae25 /src/feature/dircommon | |
| parent | 63b4ea22af8e8314dd718f02046de5f4b91edf9d (diff) | |
| download | tor-ef486e3c029efe8cb18886eea52f20af766f9daa.tar.gz tor-ef486e3c029efe8cb18886eea52f20af766f9daa.zip | |
Fix every include path changed in the previous commit (automated)
I am very glad to have written this script.
Diffstat (limited to 'src/feature/dircommon')
| -rw-r--r-- | src/feature/dircommon/consdiff.c | 6 | ||||
| -rw-r--r-- | src/feature/dircommon/consdiff.h | 2 | ||||
| -rw-r--r-- | src/feature/dircommon/dir_connection_st.h | 2 | ||||
| -rw-r--r-- | src/feature/dircommon/fp_pair.c | 4 | ||||
| -rw-r--r-- | src/feature/dircommon/voting_schedule.c | 10 | ||||
| -rw-r--r-- | src/feature/dircommon/voting_schedule.h | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/feature/dircommon/consdiff.c b/src/feature/dircommon/consdiff.c index 88edda716e..1823dc07fb 100644 --- a/src/feature/dircommon/consdiff.c +++ b/src/feature/dircommon/consdiff.c @@ -38,10 +38,10 @@ #define CONSDIFF_PRIVATE -#include "or/or.h" -#include "or/consdiff.h" +#include "core/or/or.h" +#include "feature/dircommon/consdiff.h" #include "lib/memarea/memarea.h" -#include "or/routerparse.h" +#include "feature/nodelist/routerparse.h" static const char* ns_diff_version = "network-status-diff-version 1"; static const char* hash_token = "hash"; diff --git a/src/feature/dircommon/consdiff.h b/src/feature/dircommon/consdiff.h index 1cae59a1a5..a5e4ba5cbf 100644 --- a/src/feature/dircommon/consdiff.h +++ b/src/feature/dircommon/consdiff.h @@ -5,7 +5,7 @@ #ifndef TOR_CONSDIFF_H #define TOR_CONSDIFF_H -#include "or/or.h" +#include "core/or/or.h" char *consensus_diff_generate(const char *cons1, const char *cons2); diff --git a/src/feature/dircommon/dir_connection_st.h b/src/feature/dircommon/dir_connection_st.h index 1282f82d64..768f6ba81e 100644 --- a/src/feature/dircommon/dir_connection_st.h +++ b/src/feature/dircommon/dir_connection_st.h @@ -7,7 +7,7 @@ #ifndef DIR_CONNECTION_ST_H #define DIR_CONNECTION_ST_H -#include "or/connection_st.h" +#include "core/or/connection_st.h" struct tor_compress_state_t; diff --git a/src/feature/dircommon/fp_pair.c b/src/feature/dircommon/fp_pair.c index 1d7b751c23..0544145284 100644 --- a/src/feature/dircommon/fp_pair.c +++ b/src/feature/dircommon/fp_pair.c @@ -17,8 +17,8 @@ * certificate for any (ID key, signing key) pair. **/ -#include "or/or.h" -#include "or/fp_pair.h" +#include "core/or/or.h" +#include "feature/dircommon/fp_pair.h" /* Define fp_pair_map_t structures */ diff --git a/src/feature/dircommon/voting_schedule.c b/src/feature/dircommon/voting_schedule.c index 6edde3f229..84c016c2b9 100644 --- a/src/feature/dircommon/voting_schedule.c +++ b/src/feature/dircommon/voting_schedule.c @@ -9,13 +9,13 @@ **/ #define VOTING_SCHEDULE_PRIVATE -#include "or/voting_schedule.h" +#include "feature/dircommon/voting_schedule.h" -#include "or/or.h" -#include "or/config.h" -#include "or/networkstatus.h" +#include "core/or/or.h" +#include "app/config/config.h" +#include "feature/nodelist/networkstatus.h" -#include "or/networkstatus_st.h" +#include "feature/nodelist/networkstatus_st.h" /* ===== * Vote scheduling diff --git a/src/feature/dircommon/voting_schedule.h b/src/feature/dircommon/voting_schedule.h index 0f27d36d52..0e0b0cc988 100644 --- a/src/feature/dircommon/voting_schedule.h +++ b/src/feature/dircommon/voting_schedule.h @@ -9,7 +9,7 @@ #ifndef TOR_VOTING_SCHEDULE_H #define TOR_VOTING_SCHEDULE_H -#include "or/or.h" +#include "core/or/or.h" /** Scheduling information for a voting interval. */ typedef struct { |