Make memarea use smartlist_core, not container.

diff --git a/src/lib/memarea/.may_include b/src/lib/memarea/.may_include
index 814652a93c520f65c370515d4921fd20c55df4f3..a1edaf2231f02b7615bf3efe59fbc57e373c53b3 100644 (file)
--- a/src/lib/memarea/.may_include
+++ b/src/lib/memarea/.may_include
@@ -1,7 +1,7 @@
 orconfig.h
 lib/arch/*.h
 lib/cc/*.h
-lib/container/*.h
 lib/log/*.h
 lib/malloc/*.h
 lib/memarea/*.h
+lib/smartlist_core/*.h
\ No newline at end of file

diff --git a/src/lib/memarea/memarea.c b/src/lib/memarea/memarea.c
index dd7c48c079e818bdc937ac75d650af39c23dbe5a..96d94c89d9a7ff5071727b7d41daf822d4ae96a8 100644 (file)
--- a/src/lib/memarea/memarea.c
+++ b/src/lib/memarea/memarea.c
@@ -16,7 +16,8 @@
 
 #include "lib/arch/bytes.h"
 #include "lib/cc/torint.h"
-#include "lib/container/smartlist.h"
+#include "lib/smartlist_core/smartlist_core.h"
+#include "lib/smartlist_core/smartlist_foreach.h"
 #include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"