aboutsummaryrefslogtreecommitdiff
path: root/src/lib/net
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-11-06 18:05:14 -0500
committerNick Mathewson <nickm@torproject.org>2018-11-14 16:07:03 -0500
commitf6b8c7da66bf93a9505b397661616cc4af2a34f6 (patch)
tree539837644546df6f7d7ec7b40d43843674d3a83d /src/lib/net
parentc9f9c9bc497bbfdd5e1acdc37f84da5f3f7396c2 (diff)
downloadtor-f6b8c7da66bf93a9505b397661616cc4af2a34f6.tar.gz
tor-f6b8c7da66bf93a9505b397661616cc4af2a34f6.zip
Move buffers.c out of lib/containers to resolve a circularity.
Diffstat (limited to 'src/lib/net')
-rw-r--r--src/lib/net/.may_include1
-rw-r--r--src/lib/net/buffers_net.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/net/.may_include b/src/lib/net/.may_include
index f93f0e1552..d34aaed2ca 100644
--- a/src/lib/net/.may_include
+++ b/src/lib/net/.may_include
@@ -3,6 +3,7 @@ siphash.h
ht.h
lib/arch/*.h
+lib/buf/*.h
lib/cc/*.h
lib/container/*.h
lib/ctime/*.h
diff --git a/src/lib/net/buffers_net.c b/src/lib/net/buffers_net.c
index c52ea2784e..b0936e9928 100644
--- a/src/lib/net/buffers_net.c
+++ b/src/lib/net/buffers_net.c
@@ -11,7 +11,7 @@
#define BUFFERS_PRIVATE
#include "lib/net/buffers_net.h"
-#include "lib/container/buffers.h"
+#include "lib/buf/buffers.h"
#include "lib/log/log.h"
#include "lib/log/util_bug.h"
#include "lib/net/nettypes.h"