From 27f00bb29665d6a9c725817f105cfba48af4adbe Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Fri, 5 Nov 2010 08:27:37 -0400 Subject: [PATCH] Windows: fix keystroke delay in waitkey Fix the keystroke delay in the pthreaded wait for key function. Change-Id: I79293ceca57a418d23b0a211f875c17b805f9391 Reviewed-on: http://gerrit.openafs.org/3268 Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/lwp/waitkey.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lwp/waitkey.c b/src/lwp/waitkey.c index 330725f568..79b968e48a 100644 --- a/src/lwp/waitkey.c +++ b/src/lwp/waitkey.c @@ -58,12 +58,14 @@ LWP_WaitForKeystroke(int seconds) { time_t startTime, nowTime; double timeleft = 1; +#ifndef AFS_PTHREAD_ENV struct timeval twait; - time(&startTime); - twait.tv_sec = 0; twait.tv_usec = LWP_KEYSTROKE_DELAY; +#endif + + time(&startTime); if (seconds >= 0) timeleft = seconds; @@ -79,11 +81,10 @@ LWP_WaitForKeystroke(int seconds) /* sleep for LWP_KEYSTROKE_DELAY ms and let other * process run some*/ #ifdef AFS_PTHREAD_ENV - select(0, 0, 0, 0, &twait); + Sleep(LWP_KEYSTROKE_DELAY); #else IOMGR_Select(0, 0, 0, 0, &twait); #endif - if (seconds > 0) { /* we only worry about elapsed time if * not looping forever (seconds < 0) */ /* now check elapsed time */