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.

diff --git a/src/common/include.am b/src/common/include.am
index 7427c694454ff19d05a83e58a10a85c9d66d40b5..d352a46de9bb35b2a9abacb1623505e13e994eb8 100644 (file)
--- 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
similarity index 100%
rename from src/common/handles.h
rename to src/lib/container/handles.h

diff --git a/src/lib/container/include.am b/src/lib/container/include.am
index e91ad7d1ca53449f530a84e59486a72a6214add7..e6492098b57f18054cb41ce34322ffbd8317e1d9 100644 (file)
--- 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 010a8aa5bc848306e52b8af773067494c4a40007..7f250567693198d55238c77cd3acba4ac677451d 100644 (file)
--- 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 c46b8242358ef211b24e2eab84930d21526084e1..c274a60393bd6e9baaa6c8fd9b4fe343692822f1 100644 (file)
--- 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 56b961e9a08c475d613d7085a80ff03bb8540e5f..5f9b5bdcba2fda7de665ec34f6827800bb431522 100644 (file)
--- 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 153ac5787b492c1eec409c9b92353ec8c8d2ebc0..26c68aa8a3c0c7baf8e7a54873112e45a2200541 100644 (file)
--- 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);