diff options
author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-07 19:20:12 +0100 |
---|---|---|
committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-07 19:20:12 +0100 |
commit | 7df2e1c3797df638016ae6d7a34e1781c0f1ced5 (patch) | |
tree | 2c7aa125a2e684ce5e2d91b37e4fc1e4dab7b024 /lib/memory.c | |
parent | Merge pull request #174 from LabNConsulting/working/master/patch-set/issue-172 (diff) | |
parent | Merge pull request #176 from opensourcerouting/mtype-underflow-backtrace (diff) | |
download | frr-7df2e1c3797df638016ae6d7a34e1781c0f1ced5.tar.xz frr-7df2e1c3797df638016ae6d7a34e1781c0f1ced5.zip |
Merge remote-tracking branch 'origin/stable/2.0'
Diffstat (limited to 'lib/memory.c')
-rw-r--r-- | lib/memory.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/memory.c b/lib/memory.c index b1dc01ed9..ad55366f6 100644 --- a/lib/memory.c +++ b/lib/memory.c @@ -19,11 +19,12 @@ #include <stdlib.h> #include "memory.h" +#include "log.h" static struct memgroup *mg_first = NULL; struct memgroup **mg_insert = &mg_first; -DEFINE_MGROUP(LIB, "libzebra") +DEFINE_MGROUP(LIB, "libfrr") DEFINE_MTYPE(LIB, TMP, "Temporary memory") static inline void |