summaryrefslogtreecommitdiff
path: root/tools/check-usb-chip.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
commit324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch)
treebd2d48a139bfbe869f4f49359b63097931a45e7b /tools/check-usb-chip.c
parent2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff)
parent1edb02101a9306fc711cd422ed507d18165b1691 (diff)
Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1
Diffstat (limited to 'tools/check-usb-chip.c')
-rw-r--r--tools/check-usb-chip.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/check-usb-chip.c b/tools/check-usb-chip.c
index e851855..50b3e88 100644
--- a/tools/check-usb-chip.c
+++ b/tools/check-usb-chip.c
@@ -28,7 +28,7 @@
#include "../include/sane/config.h"
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
#include "../include/sane/sane.h"
#include <stdio.h>
@@ -1408,7 +1408,7 @@ check_gl646 (struct usb_device *dev)
return "GL646";
}
-/* Same as check_gl646, except that sanity check are different. */
+/* Same as check_gl646, except that sanity checks are different. */
static char *
check_gl646_hp (struct usb_device *dev)
{
@@ -3430,9 +3430,9 @@ check_usb_chip (struct usb_device *dev, int verbosity, SANE_Bool from_file)
return chip_name;
}
-#endif /* HAVE_LIBUSB */
+#endif /* HAVE_LIBUSB_LEGACY */
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
#include <libusb.h>
@@ -4335,4 +4335,4 @@ check_usb_chip (int verbosity,
libusb_release_interface (hdl, 0);
return chip_name;
}
-#endif /* HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB */