From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Jul 2018 12:44:16 +0000 (-0400)
Subject: Make Tor compile with --disable-memory-sentinels again
X-Git-Tag: tor-0.3.5.1-alpha~254
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8554dd8804fc6e5e86962edd655bc80e32f9a75;p=thirdparty%2Ftor.git

Make Tor compile with --disable-memory-sentinels again
---

diff --git a/src/lib/memarea/.may_include b/src/lib/memarea/.may_include
index c55722284f..814652a93c 100644
--- a/src/lib/memarea/.may_include
+++ b/src/lib/memarea/.may_include
@@ -1,6 +1,7 @@
 orconfig.h
 lib/arch/*.h
 lib/cc/*.h
+lib/container/*.h
 lib/log/*.h
 lib/malloc/*.h
 lib/memarea/*.h
diff --git a/src/lib/memarea/memarea.c b/src/lib/memarea/memarea.c
index 2d510a51ac..9d494ab2d4 100644
--- a/src/lib/memarea/memarea.c
+++ b/src/lib/memarea/memarea.c
@@ -14,8 +14,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "lib/cc/torint.h"
 #include "lib/arch/bytes.h"
+#include "lib/cc/torint.h"
+#include "lib/container/smartlist.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/util_malloc.h"