treewide: switch to libubox ARRAY_SIZE immplementation

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index e4edf3125413b365a9db3e5b07b1c8ccbc2b137b..59bc4220fb3074d27eaae7d065e21c44aaaca0f6 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2018 Hans Dedecker <dedeckeh@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License v2 as published by
@@ -20,6 +21,8 @@
 #include <sys/timerfd.h>
 #include <arpa/inet.h>
 
+#include <libubox/utils.h>
+
 #include "odhcpd.h"
 #include "dhcpv6.h"
 

diff --git a/src/odhcpd.h b/src/odhcpd.h
index ef94cfccf36a142e682f6ed21acd41ed30bd35a9..423deaa1c5c7ed55994af882e734b583e520ab47 100644 (file)
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -33,8 +33,6 @@
 #include <libubox/list.h>
 #include <libubox/uloop.h>
 
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
 // RFC 6106 defines this router advertisement option
 #define ND_OPT_ROUTE_INFO 24
 #define ND_OPT_RECURSIVE_DNS 25

diff --git a/src/router.c b/src/router.c
index 70f946280d55edbe40099e02b33a6c102c813340..c02d675d5a17430295d79a8f1986678095c291b3 100644 (file)
--- a/src/router.c
+++ b/src/router.c
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2018 Hans Dedecker <dedeckeh@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License v2 as published by
@@ -23,6 +24,8 @@
 #include <arpa/inet.h>
 #include <net/route.h>
 
+#include <libubox/utils.h>
+
 #include "router.h"
 #include "odhcpd.h"
 

diff --git a/src/ubus.c b/src/ubus.c
index 1aec590289b7b914924c613e55f8fc20e4ea5da1..816ca2a538c902291b84b044f6eabdd9039d2671 100644 (file)
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -4,6 +4,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <libubox/utils.h>
+
 #include "odhcpd.h"
 #include "dhcpv6.h"
 #include "dhcpv4.h"