autogen.sh: aclocal support for Windows XP/Vista/7.

[libsigrok.git] / sigrok.h.in

diff --git a/sigrok.h.in b/sigrok.h.in
index 401e94fbeec2c7e0a4f2b428732f2fce069ac316..0b585c4e67b74e038dcfbd8d2226bfd4f39af872 100644 (file)
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -73,6 +73,25 @@ extern "C" {
 #define SR_LOG_DBG      4
 #define SR_LOG_SPEW     5
 
+/*
+ * Use SR_API to mark public API symbols, and SR_PRIV for private symbols.
+ *
+ * Variables and functions marked 'static' are private already and don't
+ * need SR_PRIV. However, functions which are not static (because they need
+ * to be used in other libsigrok-internal files) but are also not meant to
+ * be part of the public libsigrok API, must use SR_PRIV.
+ *
+ * This uses the 'visibility' feature of gcc (requires gcc >= 4.0).
+ *
+ * Details: http://gcc.gnu.org/wiki/Visibility
+ */
+
+/* Marks public libsigrok API symbols. */
+#define SR_API __attribute__((visibility("default")))
+
+/* Marks private, non-public libsigrok symbols (not part of the API). */
+#define SR_PRIV __attribute__((visibility("hidden")))
+
 typedef int (*sr_receive_data_callback) (int fd, int revents, void *user_data);
 
 /* Data types used by hardware plugins for set_configuration() */
@@ -94,10 +113,6 @@ enum {
 
 struct sr_datafeed_packet {
        uint16_t type;
-       /* timeoffset since start, in picoseconds */
-       uint64_t timeoffset;
-       /* duration of data in this packet, in picoseconds */
-       uint64_t duration;
        void *payload;
 };