diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-05 14:45:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-05 14:45:34 -0400 |
| commit | 0e4b1781f4f0135c925cd728a09cca7d7959b961 (patch) | |
| tree | 885d1bed56b9ccc668fa5d1c7f8108a9117c38d4 | |
| parent | 3d610363eff2fe70d3775a66a97f844956480141 (diff) | |
| download | tor-0e4b1781f4f0135c925cd728a09cca7d7959b961.tar.gz tor-0e4b1781f4f0135c925cd728a09cca7d7959b961.zip | |
Move handles.h to src/lib/container
There might be a better place for it in the long run, but this is
the best we can think of for now.
| -rw-r--r-- | src/common/include.am | 1 | ||||
| -rw-r--r-- | src/lib/container/handles.h (renamed from src/common/handles.h) | 0 | ||||
| -rw-r--r-- | src/lib/container/include.am | 1 | ||||
| -rw-r--r-- | src/or/channel.h | 2 | ||||
| -rw-r--r-- | src/or/conscache.h | 2 | ||||
| -rw-r--r-- | src/or/entrynodes.h | 2 | ||||
| -rw-r--r-- | src/test/test_handles.c | 2 |
7 files changed, 5 insertions, 5 deletions
diff --git a/src/common/include.am b/src/common/include.am index 7427c69445..d352a46de9 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -51,7 +51,6 @@ src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) COMMONHEADERS = \ src/common/address_set.h \ src/common/compat_libevent.h \ - src/common/handles.h \ src/common/procmon.h \ src/common/socks5_status.h \ src/common/timers.h \ diff --git a/src/common/handles.h b/src/lib/container/handles.h index 21ec0dfeec..21ec0dfeec 100644 --- a/src/common/handles.h +++ b/src/lib/container/handles.h diff --git a/src/lib/container/include.am b/src/lib/container/include.am index e91ad7d1ca..e6492098b5 100644 --- a/src/lib/container/include.am +++ b/src/lib/container/include.am @@ -21,6 +21,7 @@ noinst_HEADERS += \ src/lib/container/bitarray.h \ src/lib/container/bloomfilt.h \ src/lib/container/buffers.h \ + src/lib/container/handles.h \ src/lib/container/map.h \ src/lib/container/order.h \ src/lib/container/smartlist.h diff --git a/src/or/channel.h b/src/or/channel.h index 010a8aa5bc..7f25056769 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -11,7 +11,7 @@ #include "or/or.h" #include "or/circuitmux.h" -#include "common/handles.h" +#include "lib/container/handles.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "tor_queue.h" diff --git a/src/or/conscache.h b/src/or/conscache.h index c46b824235..c274a60393 100644 --- a/src/or/conscache.h +++ b/src/or/conscache.h @@ -4,7 +4,7 @@ #ifndef TOR_CONSCACHE_H #define TOR_CONSCACHE_H -#include "common/handles.h" +#include "lib/container/handles.h" typedef struct consensus_cache_entry_t consensus_cache_entry_t; typedef struct consensus_cache_t consensus_cache_t; diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 56b961e9a0..5f9b5bdcba 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -12,7 +12,7 @@ #ifndef TOR_ENTRYNODES_H #define TOR_ENTRYNODES_H -#include "common/handles.h" +#include "lib/container/handles.h" /* Forward declare for guard_selection_t; entrynodes.c has the real struct */ typedef struct guard_selection_s guard_selection_t; diff --git a/src/test/test_handles.c b/src/test/test_handles.c index 153ac5787b..26c68aa8a3 100644 --- a/src/test/test_handles.c +++ b/src/test/test_handles.c @@ -5,7 +5,7 @@ #include "test/test.h" #include "common/util.h" -#include "common/handles.h" +#include "lib/container/handles.h" typedef struct demo_t { HANDLE_ENTRY(demo, demo_t); |