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

Fixed compilation problem for kernel module with gcc-3.4 compiler.

merge-requests/1/head
Gerhard Jaeger 2005-04-25 09:53:08 +00:00
rodzic b4b0163175
commit 885b787ee1
3 zmienionych plików z 7 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
backend/plustek-pp_io.c
Wyświetl plik

@ -377,7 +377,7 @@ static void ioRestoreParallelMode( pScanData ps )
/** try to connect to scanner (ASIC 9600x and 98001) /** try to connect to scanner (ASIC 9600x and 98001)
*/ */
_LOC _INL void ioP98001EstablishScannerConnection( pScanData ps, ULong delTime ) _LOC void ioP98001EstablishScannerConnection( pScanData ps, ULong delTime )
{ {
_OUTB_DATA( ps, _ID_TO_PRINTER ); _OUTB_DATA( ps, _ID_TO_PRINTER );
_DO_UDELAY( delTime ); _DO_UDELAY( delTime );

4
backend/plustek-pp_misc.c
Wyświetl plik

@ -601,7 +601,7 @@ _LOC void MiscRestorePort( pScanData ps )
* @param timer - pointer to the timer to start * @param timer - pointer to the timer to start
* @param us - timeout value in micro-seconds * @param us - timeout value in micro-seconds
*/ */
_LOC _INL void MiscStartTimer( pTimerDef timer , unsigned long us) _LOC void MiscStartTimer( pTimerDef timer , unsigned long us)
{ {
struct timeval start_time; struct timeval start_time;
@ -620,7 +620,7 @@ _LOC _INL void MiscStartTimer( pTimerDef timer , unsigned long us)
* @return Function returns _E_TIMEOUT when the timer has been expired, * @return Function returns _E_TIMEOUT when the timer has been expired,
* otherwise _OK; * otherwise _OK;
*/ */
_LOC _INL int MiscCheckTimer( pTimerDef timer ) _LOC int MiscCheckTimer( pTimerDef timer )
{ {
struct timeval current_time; struct timeval current_time;

6
backend/plustek-pp_procs.h
Wyświetl plik

@ -75,10 +75,8 @@
#ifdef _BACKEND_ENABLED #ifdef _BACKEND_ENABLED
# define _LOC static # define _LOC static
# define _INL
#else #else
# define _LOC # define _LOC
# define _INL inline
#endif #endif
/* /*
@ -89,8 +87,8 @@ _LOC int MiscReinitStruct ( pScanData ps );
_LOC int MiscInitPorts ( pScanData ps, int port ); _LOC int MiscInitPorts ( pScanData ps, int port );
_LOC void MiscRestorePort( pScanData ps ); _LOC void MiscRestorePort( pScanData ps );
_LOC _INL void MiscStartTimer ( pTimerDef timer, unsigned long us ); _LOC void MiscStartTimer ( pTimerDef timer, unsigned long us );
_LOC _INL int MiscCheckTimer ( pTimerDef timer ); _LOC int MiscCheckTimer ( pTimerDef timer );
_LOC int MiscRegisterPort ( pScanData ps, int portAddr ); _LOC int MiscRegisterPort ( pScanData ps, int portAddr );
_LOC void MiscUnregisterPort ( pScanData ps ); _LOC void MiscUnregisterPort ( pScanData ps );