diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-12-16 13:17:11 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-09 07:30:35 -0500 |
| commit | 2f7a2c42d2dcc36f8d6b58aff67f6a7d388f81ed (patch) | |
| tree | f39067bc6421cddc1643188e572dc86b728ca323 /src/core | |
| parent | afa36682f959d12da1d6369b38d5d960f345c09a (diff) | |
| download | tor-2f7a2c42d2dcc36f8d6b58aff67f6a7d388f81ed.tar.gz tor-2f7a2c42d2dcc36f8d6b58aff67f6a7d388f81ed.zip | |
Include ht.h in all headers that use HT_ENTRY()
Without this change, compilation success depends on include order in
several tricky ways.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/or/.may_include | 4 | ||||
| -rw-r--r-- | src/core/or/channel.h | 1 | ||||
| -rw-r--r-- | src/core/or/circuit_st.h | 1 | ||||
| -rw-r--r-- | src/core/or/scheduler.h | 3 |
4 files changed, 7 insertions, 2 deletions
diff --git a/src/core/or/.may_include b/src/core/or/.may_include index 5173e8a2b6..beb12f155d 100644 --- a/src/core/or/.may_include +++ b/src/core/or/.may_include @@ -35,4 +35,6 @@ trunnel/*.h core/mainloop/*.h core/proto/*.h core/crypto/*.h -core/or/*.h
\ No newline at end of file +core/or/*.h + +ext/*.h diff --git a/src/core/or/channel.h b/src/core/or/channel.h index 7f5bd9bf2f..d001b8a770 100644 --- a/src/core/or/channel.h +++ b/src/core/or/channel.h @@ -14,6 +14,7 @@ #include "lib/container/handles.h" #include "lib/crypt_ops/crypto_ed25519.h" +#include "ext/ht.h" #include "tor_queue.h" #define tor_timer_t timeout diff --git a/src/core/or/circuit_st.h b/src/core/or/circuit_st.h index 929f3840ef..19cfa9838b 100644 --- a/src/core/or/circuit_st.h +++ b/src/core/or/circuit_st.h @@ -17,6 +17,7 @@ #include "lib/container/handles.h" #include "core/or/cell_queue_st.h" +#include "ext/ht.h" struct hs_token_t; struct circpad_machine_spec_t; diff --git a/src/core/or/scheduler.h b/src/core/or/scheduler.h index b82f8730b0..03cb456755 100644 --- a/src/core/or/scheduler.h +++ b/src/core/or/scheduler.h @@ -138,6 +138,8 @@ MOCK_DECL(void, scheduler_channel_has_waiting_cells, (channel_t *chan)); *****************************************************************************/ #ifdef SCHEDULER_PRIVATE_ +#include "ext/ht.h" + /********************************* * Defined in scheduler.c *********************************/ @@ -215,4 +217,3 @@ scheduler_t *get_vanilla_scheduler(void); #endif /* defined(SCHEDULER_PRIVATE_) */ #endif /* !defined(TOR_SCHEDULER_H) */ - |