[tor-commits] [tor/master] Move handles.h to src/lib/container

[nickm at torproject.org]

commit 0e4b1781f4f0135c925cd728a09cca7d7959b961
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 5 14:45:34 2018 -0400

    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.
---
 src/common/include.am                   | 1 -
 src/{common => lib/container}/handles.h | 0
 src/lib/container/include.am            | 1 +
 src/or/channel.h                        | 2 +-
 src/or/conscache.h                      | 2 +-
 src/or/entrynodes.h                     | 2 +-
 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 7427c6944..d352a46de 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
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 e91ad7d1c..e6492098b 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 010a8aa5b..7f2505676 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 c46b82423..c274a6039 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 56b961e9a..5f9b5bdcb 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 153ac5787..26c68aa8a 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);