[OpenWrt-Devel] [PATCH ubus 13/16] ubus_common: remove duplicate ARRAY_SIZE and add missing include

[Petr Štetiar]

ARRAY_SIZE is available from libubox/utils.h.

Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 ubus_common.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ubus_common.h b/ubus_common.h
index 5e4d0ad94f8f..502e5c484a75 100644
--- a/ubus_common.h
+++ b/ubus_common.h
@@ -14,13 +14,11 @@
 #ifndef __UBUS_COMMON_H
 #define __UBUS_COMMON_H
 
+#include <stdbool.h>
+
 #define UBUS_SIGNATURE_METHOD	(BLOBMSG_TYPE_LAST + 1)
 #define UBUS_SIGNATURE_END		(BLOBMSG_TYPE_LAST + 2)
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#endif
-
 static inline bool ubus_strmatch_len(const char *s1, const char *s2, int *len)
 {
 	for (*len = 0; s1[*len] == s2[*len]; (*len)++)

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel