Make ARRAY_SIZE/ARRAY_AND_SIZE private.

This is not libsigrok-specific and should not be part of our API.

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 5574281134c2ba06f3f6130ff2fc39aa8a414961..8651e779b959ff537498fbc9039541ced70c3e28 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -25,6 +25,7 @@
 #include <glib.h>
 #include <libusb.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 #include "analyzer.h"
 
 #define USB_VENDOR                     0x0c12

diff --git a/sigrok-internal.h b/sigrok-internal.h
index 85004aa13f14b8c0d27586bd6efd654825a2495b..a5326d2b9f57304ca85e82e7b77e09b0bbc52a8b 100644 (file)
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -20,6 +20,16 @@
 #ifndef SIGROK_SIGROK_INTERNAL_H
 #define SIGROK_SIGROK_INTERNAL_H
 
+/*--- Macros ----------------------------------------------------------------*/
+
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+#endif
+
+#ifndef ARRAY_AND_SIZE
+#define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
+#endif
+
 /*--- hwplugin.c ------------------------------------------------------------*/
 
 int load_hwplugins(void);

diff --git a/sigrok.h b/sigrok.h
index ba571c2c79eeb4ca23f2e99b34de93856890d51f..6eeca9a3c9ff1617ed707204398d9bcce2361338 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -66,14 +66,6 @@ extern "C" {
 
 #define HZ_TO_NS(n) (1000000000 / (n))
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#endif
-
-#ifndef ARRAY_AND_SIZE
-#define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
-#endif
-
 typedef int (*sr_receive_data_callback) (int fd, int revents, void *user_data);
 
 /* Data types used by hardware plugins for set_configuration() */