diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-06 20:27:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-14 16:07:35 -0500 |
| commit | e429e31ad1c3000d814f3172fcd3f7c433ee3219 (patch) | |
| tree | 9bcd3f344b7cb4e2e6e38155f5a51e70ac497ae8 /src/lib/container | |
| parent | c0a7527eb8590b39f11dd8b0ae18794dfc63a934 (diff) | |
| download | tor-e429e31ad1c3000d814f3172fcd3f7c433ee3219.tar.gz tor-e429e31ad1c3000d814f3172fcd3f7c433ee3219.zip | |
Normalize .may_include to always have paths, and paths to include
Diffstat (limited to 'src/lib/container')
| -rw-r--r-- | src/lib/container/.may_include | 6 | ||||
| -rw-r--r-- | src/lib/container/bloomfilt.c | 2 | ||||
| -rw-r--r-- | src/lib/container/map.c | 2 | ||||
| -rw-r--r-- | src/lib/container/map.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/container/.may_include b/src/lib/container/.may_include index 76e5843728..81507527d3 100644 --- a/src/lib/container/.may_include +++ b/src/lib/container/.may_include @@ -7,9 +7,9 @@ lib/malloc/*.h lib/err/*.h lib/smartlist_core/*.h lib/string/*.h -lib/testsupport/testsupport.h +lib/testsupport/*.h lib/intmath/*.h lib/log/*.h -ht.h -siphash.h +ext/ht.h +ext/siphash.h diff --git a/src/lib/container/bloomfilt.c b/src/lib/container/bloomfilt.c index ea2d2917c7..a64fcb9300 100644 --- a/src/lib/container/bloomfilt.c +++ b/src/lib/container/bloomfilt.c @@ -14,7 +14,7 @@ #include "lib/container/bloomfilt.h" #include "lib/intmath/bits.h" #include "lib/log/util_bug.h" -#include "siphash.h" +#include "ext/siphash.h" /** How many bloom-filter bits we set per address. This is twice the * BLOOMFILT_N_HASHES value, since we split the siphash output into two 32-bit diff --git a/src/lib/container/map.c b/src/lib/container/map.c index 85e074e10a..137e316920 100644 --- a/src/lib/container/map.c +++ b/src/lib/container/map.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> -#include "ht.h" +#include "ext/ht.h" /** Helper: Declare an entry type and a map type to implement a mapping using * ht.h. The map type will be called <b>maptype</b>. The key part of each diff --git a/src/lib/container/map.h b/src/lib/container/map.h index ff71622682..4f427fe767 100644 --- a/src/lib/container/map.h +++ b/src/lib/container/map.h @@ -15,7 +15,7 @@ #include "lib/testsupport/testsupport.h" #include "lib/cc/torint.h" -#include "siphash.h" +#include "ext/siphash.h" #define DECLARE_MAP_FNS(maptype, keytype, prefix) \ typedef struct maptype maptype; \ |