From 2e87bb658d496f9f7f5c3400494a9e6f3260cc75 Mon Sep 17 00:00:00 2001
From: Nick Hainke <vincent@systemli.org>
Date: Mon, 1 Feb 2021 21:17:51 +0100
Subject: [PATCH] babeld: adopt to upstream header-style

Instead of including the headerfiles that define the structs, we add
the struct definitions to our headerfile.

Fixes warning:

ubus.h:67:32: warning: 'struct xroute' declared inside parameter list will not be visible outside of this definition or declaration
 void ubus_notify_xroute(struct xroute *xroute, int kind);
                                ^~~~~~
Signed-off-by: Nick Hainke <vincent@systemli.org>
---
 babeld/Makefile   | 2 +-
 babeld/src/ubus.c | 1 +
 babeld/src/ubus.h | 7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/babeld/Makefile b/babeld/Makefile
index ef77f0a..b7aa135 100644
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babeld
 PKG_VERSION:=1.9.2
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/
diff --git a/babeld/src/ubus.c b/babeld/src/ubus.c
index c97ee0a..e6d6d68 100644
--- a/babeld/src/ubus.c
+++ b/babeld/src/ubus.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <sys/select.h>
 
+#include <libubus.h>
 #include <libubox/blob.h>
 #include <libubox/blobmsg.h>
 #include <libubox/list.h>
diff --git a/babeld/src/ubus.h b/babeld/src/ubus.h
index 66ef997..be9059a 100644
--- a/babeld/src/ubus.h
+++ b/babeld/src/ubus.h
@@ -21,7 +21,12 @@
 
 */
 
-#include <libubus.h>
+#include <stdbool.h>
+
+struct fd_set;
+struct neighbour;
+struct babel_route;
+struct xroute;
 
 // Whether to enable ubus bindings (boolean option).
 extern int ubus_bindings;