From 1695dd4278a082967028fab253eb69557e146e47 Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Sat, 4 Feb 2006 20:51:07 +0000 Subject: [PATCH] Workaround for compilation problem on Windows/cygwin. --- ChangeLog | 2 ++ include/sane/sanei_usb.h | 8 ++++---- sanei/sanei_usb.c | 12 ++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44351b692..187ccd921 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * doc/descriptions/unsupported.desc: Removed Trust Office Scan USB 19200 (now in niash.desc), added Xerox 4800 One Touch. + * include/sane/sanei_usb.h sanei/sanei_usb.c: Workaround for + compilation problem on Windows/cygwin. 2006-02-04 Ullrich Sigwanz diff --git a/include/sane/sanei_usb.h b/include/sane/sanei_usb.h index e7d09f2bb..ad6fb876b 100644 --- a/include/sane/sanei_usb.h +++ b/include/sane/sanei_usb.h @@ -367,7 +367,7 @@ sanei_usb_set_configuration (SANE_Int dn, SANE_Int configuration); * Change claim interface * * @param dn device number - * @param interface, interface nummber + * @param interface_number, interface nummber * * @return * - SANE_STATUS_GOOD - on succes @@ -378,14 +378,14 @@ sanei_usb_set_configuration (SANE_Int dn, SANE_Int configuration); */ extern SANE_Status -sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface); +sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface_number); /** Initiate release interface. * * Change release interface * * @param dn device number - * @param interface, interface nummber + * @param interface_number, interface nummber * * @return * - SANE_STATUS_GOOD - on succes @@ -396,7 +396,7 @@ sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface); */ extern SANE_Status -sanei_usb_release_interface (SANE_Int dn, SANE_Int interface); +sanei_usb_release_interface (SANE_Int dn, SANE_Int interface_number); /** Initiate a set altinterface. * diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c index 34a27e539..28598b57e 100644 --- a/sanei/sanei_usb.c +++ b/sanei/sanei_usb.c @@ -1764,7 +1764,7 @@ sanei_usb_set_configuration (SANE_Int dn, SANE_Int configuration) } SANE_Status -sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface) +sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface_number) { if (dn >= MAX_DEVICES || dn < 0) { @@ -1774,7 +1774,7 @@ sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface) return SANE_STATUS_INVAL; } - DBG (5, "sanei_usb_claim_interface: interface = %d\n", interface); + DBG (5, "sanei_usb_claim_interface: interface_number = %d\n", interface_number); if (devices[dn].method == sanei_usb_method_scanner_driver) { @@ -1790,7 +1790,7 @@ sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface) { int result; - result = usb_claim_interface (devices[dn].libusb_handle, interface); + result = usb_claim_interface (devices[dn].libusb_handle, interface_number); if (result < 0) { DBG (1, "sanei_usb_claim_interface: libusb complained: %s\n", @@ -1814,7 +1814,7 @@ sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface) } SANE_Status -sanei_usb_release_interface (SANE_Int dn, SANE_Int interface) +sanei_usb_release_interface (SANE_Int dn, SANE_Int interface_number) { if (dn >= MAX_DEVICES || dn < 0) { @@ -1824,7 +1824,7 @@ sanei_usb_release_interface (SANE_Int dn, SANE_Int interface) return SANE_STATUS_INVAL; } - DBG (5, "sanei_usb_release_interface: interface = %d\n", interface); + DBG (5, "sanei_usb_release_interface: interface_number = %d\n", interface_number); if (devices[dn].method == sanei_usb_method_scanner_driver) { @@ -1840,7 +1840,7 @@ sanei_usb_release_interface (SANE_Int dn, SANE_Int interface) { int result; - result = usb_release_interface (devices[dn].libusb_handle, interface); + result = usb_release_interface (devices[dn].libusb_handle, interface_number); if (result < 0) { DBG (1, "sanei_usb_release_interface: libusb complained: %s\n",