diff options
| author | teor <teor@torproject.org> | 2019-04-09 11:36:38 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-09 11:36:38 +1000 |
| commit | e4692fad9680ffea938dd6024ceacfc1ba1edffa (patch) | |
| tree | 31920c445130fd5b97d35036fbd84e6ec05cefd4 | |
| parent | 2dab7a10780db1047bda4e18c2d308274744e806 (diff) | |
| parent | c66df27c906b1140ea33f4e5d5ab9486594ada9d (diff) | |
| download | tor-e4692fad9680ffea938dd6024ceacfc1ba1edffa.tar.gz tor-e4692fad9680ffea938dd6024ceacfc1ba1edffa.zip | |
Merge remote-tracking branch 'tor-github/pr/866'
| -rw-r--r-- | src/ext/timeouts/.may_include | 5 | ||||
| -rw-r--r-- | src/ext/timeouts/test-timeout.c | 2 | ||||
| -rw-r--r-- | src/ext/timeouts/timeout.c | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/ext/timeouts/.may_include b/src/ext/timeouts/.may_include index 42f44befd4..92c7116555 100644 --- a/src/ext/timeouts/.may_include +++ b/src/ext/timeouts/.may_include @@ -1,6 +1,5 @@ orconfig.h ext/tor_queue.h -timeout-bitops.c -timeout-debug.h -timeout.h +ext/timeouts/*.h +ext/timeouts/timeout-bitops.c diff --git a/src/ext/timeouts/test-timeout.c b/src/ext/timeouts/test-timeout.c index 8077129376..52d2e31e0c 100644 --- a/src/ext/timeouts/test-timeout.c +++ b/src/ext/timeouts/test-timeout.c @@ -4,7 +4,7 @@ #include <assert.h> #include <limits.h> -#include "timeout.h" +#include "ext/timeouts/timeout.h" #define THE_END_OF_TIME ((timeout_t)-1) diff --git a/src/ext/timeouts/timeout.c b/src/ext/timeouts/timeout.c index 07d06772c5..79fcc168ed 100644 --- a/src/ext/timeouts/timeout.c +++ b/src/ext/timeouts/timeout.c @@ -40,14 +40,14 @@ #include "ext/tor_queue.h" /* TAILQ(3) */ -#include "timeout.h" +#include "ext/timeouts/timeout.h" #ifndef TIMEOUT_DEBUG #define TIMEOUT_DEBUG 0 #endif #if TIMEOUT_DEBUG - 0 -#include "timeout-debug.h" +#include "ext/timeouts/timeout-debug.h" #endif #ifdef TIMEOUT_DISABLE_RELATIVE_ACCESS @@ -141,7 +141,7 @@ #define WHEEL_MASK (WHEEL_LEN - 1) #define TIMEOUT_MAX ((TIMEOUT_C(1) << (WHEEL_BIT * WHEEL_NUM)) - 1) -#include "timeout-bitops.c" +#include "ext/timeouts/timeout-bitops.c" #if WHEEL_BIT == 6 #define ctz(n) ctz64(n) |