From 1edb02101a9306fc711cd422ed507d18165b1691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 15 Jul 2017 11:25:39 +0200 Subject: move from support/1.0.27 to feature/1.0.27 --- tools/check-usb-chip.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/check-usb-chip.c') 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 @@ -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 @@ -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 */ -- cgit v1.2.3