commit c66df27c906b1140ea33f4e5d5ab9486594ada9d Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 28 16:35:24 2019 -0400
Fix checkIncludes warning about "unusual pattern in src/ext/timeouts/"
Closes ticket 28806. --- src/ext/timeouts/.may_include | 5 ++--- src/ext/timeouts/test-timeout.c | 2 +- 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 42f44befd..92c711655 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 807712937..52d2e31e0 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 07d06772c..79fcc168e 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)