From 6021c8d38268ca67b58f1f5d29440782ee8826aa Mon Sep 17 00:00:00 2001
From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 16 Jun 2017 17:40:17 -0400
Subject: [PATCH] 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>
---
 lib/zebra.h | 2 ++
 1 file changed, 2 insertions(+)

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>