aboutsummaryrefslogtreecommitdiff
path: root/libjava/posix-threads.cc
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/posix-threads.cc')
-rw-r--r--libjava/posix-threads.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/libjava/posix-threads.cc b/libjava/posix-threads.cc
index 436588aee32..825b0206c19 100644
--- a/libjava/posix-threads.cc
+++ b/libjava/posix-threads.cc
@@ -85,12 +85,11 @@ _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu,
r = pthread_cond_wait (cv, pmu);
else
{
- struct timespec ts;
- unsigned long m = millis + java::lang::System::currentTimeMillis ();
-
- ts.tv_sec = m / 1000;
- ts.tv_nsec = (m % 1000) * 1000 * 1000 + nanos;
-
+ struct timespec ts;
+ jlong m = millis + java::lang::System::currentTimeMillis ();
+ ts.tv_sec = m / 1000;
+ ts.tv_nsec = ((m % 1000) * 1000000) + nanos;
+
r = pthread_cond_timedwait (cv, pmu, &ts);
}
return r;