diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-06-16 17:40:17 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-06-16 17:48:18 -0400 |
| commit | 6021c8d38268ca67b58f1f5d29440782ee8826aa (patch) | |
| tree | da87ddcf33e718e8c9aa8820c20373bc08cd52be | |
| parent | 522faa1f8be658c18284e3e9e5dcaefdf92c4c57 (diff) | |
lib: Fix ordering of RB Tree
So the *bsd implementations of RB Tree's for older
platforms use a macro implementation. New platforms
have converted to a function implementation that uses
a different calling parameter list. So when
we attempt to build FRR on older *bsd implementations
the macro's and functions do not interact too well.
As a workaround put the openbsd-tree.h #include
inside of zebra.h at a point before the particular
platforms version is included. Since we use
the same #if guard for the header we should be ok.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| -rw-r--r-- | lib/zebra.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/zebra.h b/lib/zebra.h index 0a61c433d9..2cc433a863 100644 --- a/lib/zebra.h +++ b/lib/zebra.h @@ -126,6 +126,8 @@ typedef unsigned char u_int8_t; #define __APPLE_USE_RFC_3542 #endif +#include "lib/openbsd-tree.h" + #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> |