Browse Source

Fix checkIncludes warning about "unusual pattern in src/ext/timeouts/"

Closes ticket 28806.
Nick Mathewson 5 years ago
parent
commit
c66df27c90
3 changed files with 6 additions and 7 deletions
  1. 2 3
      src/ext/timeouts/.may_include
  2. 1 1
      src/ext/timeouts/test-timeout.c
  3. 3 3
      src/ext/timeouts/timeout.c

+ 2 - 3
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

+ 1 - 1
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)
 

+ 3 - 3
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)