From 53c4fe2e15a7404818f070768bf6ad0b6fe6565d Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Fri, 30 Apr 2004 21:02:04 +0000 Subject: [PATCH] Added last minute fix to avoid compilation trouble with gcc 3.4. --- ChangeLog | 2 ++ backend/sm3600.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2d00036ff..e37ecb0f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ * doc/descriptions/unsupported.desc: Added link to more info about Microtek ScanMaker 3630. * NEWS: Updated for release. + * backend/sm3600.h: Added last minute fix to avoid compilation + trouble with gcc 3.4. 2004-04-29 Oliver Schwartz diff --git a/backend/sm3600.h b/backend/sm3600.h index 28989002a..1954c8b9d 100644 --- a/backend/sm3600.h +++ b/backend/sm3600.h @@ -276,7 +276,7 @@ __SM3600EXPORT__ TState DoInit(TInstance *this); __SM3600EXPORT__ TState DoReset(TInstance *this); __SM3600EXPORT__ TState WaitWhileBusy(TInstance *this,int cSecs); __SM3600EXPORT__ TState WaitWhileScanning(TInstance *this,int cSecs); -__SM3600EXPORT__ TState GetScannerModel(unsigned short idVendor, unsigned short idProduct); +__SM3600EXPORT__ TModel GetScannerModel(unsigned short idVendor, unsigned short idProduct); #ifdef INSANE_VERSION __SM3600EXPORT__ TState DoLampSwitch(TInstance *this,int nPattern);