diff --git a/ChangeLog b/ChangeLog index 6390382e2..55b611958 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-01-29 Henning Meier-Geinitz + + * backend/mustek_scsi_pp.c: Use gettimeofday() instead of + ftime(). Bug #300482. + 2004-01-21 Gerhard Jaeger * backend/test.c: reader_process terminates now, when running as thread. diff --git a/backend/mustek_scsi_pp.c b/backend/mustek_scsi_pp.c index cc5d3e555..c43d6aa29 100644 --- a/backend/mustek_scsi_pp.c +++ b/backend/mustek_scsi_pp.c @@ -57,10 +57,11 @@ #include #include -#include #include #include +#include + #include "../include/sane/sane.h" #include "../include/sane/sanei.h" #include "../include/sane/saneopts.h" @@ -81,11 +82,13 @@ static int mustek_scsi_pp_timeout = 5000; static int mustek_scsi_pp_get_time () { - struct timeb tp; + struct timeval tv; int retval; - ftime (&tp); - retval = tp.time * 1000 + tp.millitm; + gettimeofday (&tv, 0); + + retval = tv.tv_sec * 1000 + tv.tv_usec / 1000; + return retval; }