mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Workaround for compilation problem on Windows/cygwin.

merge-requests/1/head
Henning Geinitz 2006-02-04 20:51:07 +00:00
rodzic a946b95e22
commit 1695dd4278
3 zmienionych plików z 12 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
ChangeLog
Wyświetl plik

@ -2,6 +2,8 @@
* doc/descriptions/unsupported.desc: Removed Trust Office Scan USB * doc/descriptions/unsupported.desc: Removed Trust Office Scan USB
19200 (now in niash.desc), added Xerox 4800 One Touch. 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 <usigwanz@freesurf.ch> 2006-02-04 Ullrich Sigwanz <usigwanz@freesurf.ch>

8
include/sane/sanei_usb.h
Wyświetl plik

@ -367,7 +367,7 @@ sanei_usb_set_configuration (SANE_Int dn, SANE_Int configuration);
* Change claim interface * Change claim interface
* *
* @param dn device number * @param dn device number
* @param interface, interface nummber * @param interface_number, interface nummber
* *
* @return * @return
* - SANE_STATUS_GOOD - on succes * - SANE_STATUS_GOOD - on succes
@ -378,14 +378,14 @@ sanei_usb_set_configuration (SANE_Int dn, SANE_Int configuration);
*/ */
extern SANE_Status 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. /** Initiate release interface.
* *
* Change release interface * Change release interface
* *
* @param dn device number * @param dn device number
* @param interface, interface nummber * @param interface_number, interface nummber
* *
* @return * @return
* - SANE_STATUS_GOOD - on succes * - SANE_STATUS_GOOD - on succes
@ -396,7 +396,7 @@ sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface);
*/ */
extern SANE_Status 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. /** Initiate a set altinterface.
* *

12
sanei/sanei_usb.c
Wyświetl plik

@ -1764,7 +1764,7 @@ sanei_usb_set_configuration (SANE_Int dn, SANE_Int configuration)
} }
SANE_Status 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) if (dn >= MAX_DEVICES || dn < 0)
{ {
@ -1774,7 +1774,7 @@ sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface)
return SANE_STATUS_INVAL; 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) 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; int result;
result = usb_claim_interface (devices[dn].libusb_handle, interface); result = usb_claim_interface (devices[dn].libusb_handle, interface_number);
if (result < 0) if (result < 0)
{ {
DBG (1, "sanei_usb_claim_interface: libusb complained: %s\n", 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 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) if (dn >= MAX_DEVICES || dn < 0)
{ {
@ -1824,7 +1824,7 @@ sanei_usb_release_interface (SANE_Int dn, SANE_Int interface)
return SANE_STATUS_INVAL; 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) 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; int result;
result = usb_release_interface (devices[dn].libusb_handle, interface); result = usb_release_interface (devices[dn].libusb_handle, interface_number);
if (result < 0) if (result < 0)
{ {
DBG (1, "sanei_usb_release_interface: libusb complained: %s\n", DBG (1, "sanei_usb_release_interface: libusb complained: %s\n",