config.h usage cleanups.

 - Drop config.h #include from files that don't actually use any of
   its contents (at the moment).

 - Add comment for those that do need it.

diff --git a/backend.c b/backend.c
index 389df253f2abe008911fbe9a8346eb92a483c6b6..4823044efce580dbc9d7a116f1eb46e63a84a389 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -19,6 +19,7 @@
  */
 
 #include <glib.h>
+#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 

diff --git a/device.c b/device.c
index 2509c542ba4566816998f58e74de4bd4a6e7c881..740ad5077cebcf350e99757e575dc0901c030a13 100644 (file)
--- a/device.c
+++ b/device.c
@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 #include <glib.h>
+#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index da5cad6f9e89e099b54d1cf1d323fc58308d73d0..7987086eb2f85b700f26772e85a45ab6ac9a3003 100644 (file)
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -20,7 +20,6 @@
 #include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include "config.h"
 #include "agilent-dmm.h"
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/hardware/agilent-dmm/sched.c b/hardware/agilent-dmm/sched.c
index 151b8fce54a85e5cab8cec2bf02dd75455f2c4f2..6687953ad6f1dbf4ec9f9c0d018d575ea2c83035 100644 (file)
--- a/hardware/agilent-dmm/sched.c
+++ b/hardware/agilent-dmm/sched.c
@@ -20,7 +20,6 @@
 #include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include "config.h"
 #include "agilent-dmm.h"
 #include <stdlib.h>
 #include <string.h>

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index e75849e6e0134e9dbbef816d8107c19b21f7154f..d6c322accdc9416a0ccc3e214d5d8dc31cc7ec48 100644 (file)
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -20,7 +20,6 @@
 #include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include "config.h"
 #include "fluke-dmm.h"
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/hardware/fluke-dmm/fluke.c b/hardware/fluke-dmm/fluke.c
index 9ed24cb61e80d5ed85d7c2e63bf8942006b9b065..9258fab56669bd91d2bbaa18cea2fb32af27f9a7 100644 (file)
--- a/hardware/fluke-dmm/fluke.c
+++ b/hardware/fluke-dmm/fluke.c
@@ -20,7 +20,6 @@
 #include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include "config.h"
 #include "fluke-dmm.h"
 #include <stdlib.h>
 #include <math.h>

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 118d2d24dbb4bfa6b7ec3748cd246761b4c51660..9a1932701f587c807001d6f0b6dff046ac2c0973 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <inttypes.h>
 #include <libusb.h>
-#include "config.h"
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "fx2lafw.h"

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 4982d2ab974ed505d35bbc5392632696c0dbf4d9..e35dacbdd310193c8b786a62c4a8521aac925611 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -31,7 +31,6 @@
 #include <libusb.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include "config.h"
 #include "dso.h"
 
 

diff --git a/hardware/hantek-dso/dso.c b/hardware/hantek-dso/dso.c
index 8480f07f854a096ee4d5dba86f4826d78c25c483..3fea9a5853c8afbbd2d8cefff0daf8abde203db7 100644 (file)
--- a/hardware/hantek-dso/dso.c
+++ b/hardware/hantek-dso/dso.c
@@ -21,7 +21,6 @@
 
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include "config.h"
 #include "dso.h"
 #include <string.h>
 #include <glib.h>

diff --git a/hardware/radioshack-dmm/api.c b/hardware/radioshack-dmm/api.c
index 62b3c0d11308631d56a679f4e0d3ea284f2e956c..6388c4631744f2333acf3c28b4f107a2d6356e23 100644 (file)
--- a/hardware/radioshack-dmm/api.c
+++ b/hardware/radioshack-dmm/api.c
@@ -21,7 +21,6 @@
 #include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include "config.h"
 #include "radioshack-dmm.h"
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/hardware/radioshack-dmm/radioshack.c b/hardware/radioshack-dmm/radioshack.c
index e4fc43cf0fb1b146bf1e05e03c58c2cfd513c6ca..2ce7c8f866ad9b3c93c92909f41a7959eedaa9cd 100644 (file)
--- a/hardware/radioshack-dmm/radioshack.c
+++ b/hardware/radioshack-dmm/radioshack.c
@@ -21,7 +21,6 @@
 #include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include "config.h"
 #include "radioshack-dmm.h"
 #include <stdlib.h>
 #include <math.h>

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 85555d8582b5419eb977cc893229fc88e134efb5..c22f9458418aee2524ab19cf7d1431312a7e469f 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -24,7 +24,6 @@
 #include <inttypes.h>
 #include <glib.h>
 #include <libusb.h>
-#include "config.h"
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "analyzer.h"

diff --git a/hwdriver.c b/hwdriver.c
index 8be8a9e2dd8820d6fc813a6e6b45aadd86198c43..ef7f3efeff3a6a53a02753036e7fac3e8d0e92f0 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -23,6 +23,7 @@
 #include <dirent.h>
 #include <string.h>
 #include <glib.h>
+#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 38647622d825c0167ee3025b376200a95775ac86..9983d66a1e0e911a9e1a7096aa5f4f8ea411f615 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -96,8 +96,8 @@ SR_PRIV struct sr_probe *sr_probe_new(int index, int type,
 SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
                const char *vendor, const char *model, const char *version);
 SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi);
-#ifdef HAVE_LIBUSB_1_0
 
+#ifdef HAVE_LIBUSB_1_0
 /* USB-specific instances */
 SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
                uint8_t address, struct libusb_device_handle *hdl);

diff --git a/output/analog.c b/output/analog.c
index 05194daba4b9a2d868bf26537cff198eda13d524..6f3609c07435f4246e30c13609b75757e57349c5 100644 (file)
--- a/output/analog.c
+++ b/output/analog.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h"
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include <math.h>

diff --git a/output/csv.c b/output/csv.c
index 31e4d8d9c78eef6d874b3d41ccf3115fd1973fbc..def7c893280960fe4a8ea51a6e3a5ffd6db6413c 100644 (file)
--- a/output/csv.c
+++ b/output/csv.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h"
+#include "config.h" /* Needed for PACKAGE_STRING and others. */
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 

diff --git a/output/float.c b/output/float.c
index 5c9631f4b2844007b90f094523a769a30b8f8656..cd4ef8c36f0cddff67af7ce13708de9d662c0a5d 100644 (file)
--- a/output/float.c
+++ b/output/float.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h"
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 

diff --git a/output/gnuplot.c b/output/gnuplot.c
index a2124bb16e0218d29add9f1e7612297de2e33add..6e0e745f7b74d7f9bfefa98dc11d061c2afb1531 100644 (file)
--- a/output/gnuplot.c
+++ b/output/gnuplot.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h"
+#include "config.h" /* Needed for PACKAGE_STRING and others. */
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 

diff --git a/output/text/text.c b/output/text/text.c
index 6462cb9edb34d739f0523e71fb9d50d08cc4f958..60d2715418ceb7451c500a68c45f4a3125a00698 100644 (file)
--- a/output/text/text.c
+++ b/output/text/text.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h"
+#include "config.h" /* Needed for PACKAGE_STRING and others. */
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "text.h"

diff --git a/output/vcd.c b/output/vcd.c
index 3a2114c8d3a991aa006240e039c954f961b628f7..6e3910fdb3459e4869ddc2726b1d8712bb20bdcb 100644 (file)
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h"
+#include "config.h" /* Needed for PACKAGE and others. */
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 

diff --git a/session_file.c b/session_file.c
index 41ca36c5fbd04e7a0f3920d9b97cfed80eaa9ab1..3746520ba1a41cd8ea1ab7bfa750c81b6dcf6a9a 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -23,7 +23,7 @@
 #include <zip.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include "config.h"
+#include "config.h" /* Needed for PACKAGE_VERSION and others. */
 #include "libsigrok.h"
 #include "libsigrok-internal.h"