Make ARRAY_SIZE/ARRAY_AND_SIZE private.

[libsigrok.git] / sigrok.h

diff --git a/sigrok.h b/sigrok.h
index 81709b3e6989536a78bd99780d4d56a53b2e7ee8..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() */
@@ -157,8 +149,8 @@ struct sr_output_format {
        char *description;
        int df_type;
        int (*init) (struct sr_output *o);
-       int (*data) (struct sr_output *o, char *data_in, uint64_t length_in,
-                    char **data_out, uint64_t *length_out);
+       int (*data) (struct sr_output *o, const char *data_in,
+                    uint64_t length_in, char **data_out, uint64_t *length_out);
        int (*event) (struct sr_output *o, int event_type, char **data_out,
                      uint64_t *length_out);
 };
@@ -326,7 +318,7 @@ struct sr_device_plugin {
        char *name;
        char *longname;
        int api_version;
-       int (*init) (char *deviceinfo);
+       int (*init) (const char *deviceinfo);
        void (*cleanup) (void);
 
        /* Device-specific */