Browse Source

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.
Nick Mathewson 5 years ago
parent
commit
0e4b1781f4

+ 0 - 1
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				\

+ 0 - 0
src/common/handles.h → src/lib/container/handles.h


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

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

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

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

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