diff options
author | Mark Stapp <mjs@voltanet.io> | 2021-05-03 17:17:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-03 17:17:36 +0200 |
commit | f71e1ff6a98d0e244c7da11d870d14e31b517811 (patch) | |
tree | 0657d1718fa1018c0e8aa3bea76266f9dd6677ad /zebra | |
parent | Merge pull request #8605 from donaldsharp/libyang_version (diff) | |
parent | lib: fix random C++ compat problem w/ printfrr (diff) | |
download | frr-f71e1ff6a98d0e244c7da11d870d14e31b517811.tar.xz frr-f71e1ff6a98d0e244c7da11d870d14e31b517811.zip |
Merge pull request #8545 from opensourcerouting/assert-our-own
*: make our own assert() actually work
Diffstat (limited to 'zebra')
-rw-r--r-- | zebra/zebra_routemap_nb.c | 2 | ||||
-rw-r--r-- | zebra/zserv.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/zebra/zebra_routemap_nb.c b/zebra/zebra_routemap_nb.c index c82c34dd5..9da458950 100644 --- a/zebra/zebra_routemap_nb.c +++ b/zebra/zebra_routemap_nb.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <zebra.h> + #include "northbound.h" #include "libfrr.h" #include "zebra_routemap_nb.h" diff --git a/zebra/zserv.c b/zebra/zserv.c index f89b6fe47..0bf4d8ece 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -50,7 +50,6 @@ #include "lib/thread.h" /* for thread (ptr only), THREAD_ARG, ... */ #include "lib/vrf.h" /* for vrf_info_lookup, VRF_DEFAULT */ #include "lib/vty.h" /* for vty_out, vty (ptr only) */ -#include "lib/zassert.h" /* for assert */ #include "lib/zclient.h" /* for zmsghdr, ZEBRA_HEADER_SIZE, ZEBRA... */ #include "lib/frr_pthread.h" /* for frr_pthread_new, frr_pthread_stop... */ #include "lib/frratomic.h" /* for atomic_load_explicit, atomic_stor... */ |