summaryrefslogtreecommitdiffstats
path: root/zebra/test_main.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2015-05-29 05:48:31 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-09-19 22:31:04 +0200
commit4a1ab8e4050a141d3d7a80b5f8bb27dfd045dae8 (patch)
tree14b33d958cb88df6195994c78ee74b781e7968a6 /zebra/test_main.c
parentlib: migrate to new memory-type handling (diff)
downloadfrr-4a1ab8e4050a141d3d7a80b5f8bb27dfd045dae8.tar.xz
frr-4a1ab8e4050a141d3d7a80b5f8bb27dfd045dae8.zip
*: split & distribute memtypes and stop (re|ab)using lib/ MTYPEs
This is a rather large mechanical commit that splits up the memory types defined in lib/memtypes.c and distributes them into *_memory.[ch] files in the individual daemons. The zebra change is slightly annoying because there is no nice place to put the #include "zebra_memory.h" statement. bgpd, ospf6d, isisd and some tests were reusing MTYPEs defined in the library for its own use. This is bad practice and would break when the memtype are made static. Acked-by: Vincent JARDIN <vincent.jardin@6wind.com> Acked-by: Donald Sharp <sharpd@cumulusnetworks.com> [CF: rebased for cmaster-next] Signed-off-by: David Lamparter <equinox@opensourcerouting.org> Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Diffstat (limited to 'zebra/test_main.c')
-rw-r--r--zebra/test_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/zebra/test_main.c b/zebra/test_main.c
index 7d0baf259..bbaf45028 100644
--- a/zebra/test_main.c
+++ b/zebra/test_main.c
@@ -25,6 +25,7 @@
#include "thread.h"
#include "filter.h"
#include "memory.h"
+#include "zebra_memory.h"
#include "memory_vty.h"
#include "prefix.h"
#include "log.h"