From 1fc446a819a244515d9461fa50d34ee191414d6f Mon Sep 17 00:00:00 2001 From: gshapiro Date: Sun, 1 Aug 2004 01:04:57 +0000 Subject: Import sendmail 8.13.1 --- contrib/sendmail/libsm/clock.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'contrib/sendmail/libsm/clock.c') diff --git a/contrib/sendmail/libsm/clock.c b/contrib/sendmail/libsm/clock.c index 4d70cb8..5805554 100644 --- a/contrib/sendmail/libsm/clock.c +++ b/contrib/sendmail/libsm/clock.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -12,7 +12,7 @@ */ #include -SM_RCSID("@(#)$Id: clock.c,v 1.35.2.10 2003/06/26 16:36:49 ca Exp $") +SM_RCSID("@(#)$Id: clock.c,v 1.45 2004/01/19 19:32:08 ca Exp $") #include #include #include @@ -523,11 +523,14 @@ sleep(intvl) SM_EVENT *ev; #if _FFR_SLEEP_USE_SELECT > 0 int r; +# if _FFR_SLEEP_USE_SELECT > 0 + struct timeval sm_io_to; +# endif /* _FFR_SLEEP_USE_SELECT > 0 */ #endif /* _FFR_SLEEP_USE_SELECT > 0 */ #if SM_CONF_SETITIMER struct timeval now, begin, diff; # if _FFR_SLEEP_USE_SELECT > 0 - struct timeval sm_io_to, slpv; + struct timeval slpv; # endif /* _FFR_SLEEP_USE_SELECT > 0 */ #else /* SM_CONF_SETITIMER */ time_t begin, now; @@ -596,7 +599,7 @@ sleep(intvl) sm_io_to.tv_sec = intvl - (now - begin); if (sm_io_to.tv_sec <= 0) sm_io_to.tv_sec = 1; - sm_io_to.utv_sec = 0; + sm_io_to.tv_usec = 0; # endif /* _FFR_SLEEP_USE_SELECT > 0 */ #endif /* SM_CONF_SETITIMER */ #if _FFR_SLEEP_USE_SELECT > 0 -- cgit v1.1