[kaffe] CVS kaffe (dalibor): Fixed small compiler warning introduced by header change
Kaffe CVS
Kaffe Mailing List <kaffe@kaffe.org>
Thu Mar 25 02:44:02 2004
PatchSet 4580
Date: 2004/03/25 10:40:16
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixed small compiler warning introduced by header change
2004-03-25 Dalibor Topic <robilad@kaffe.org>
* kaffe/kaffevm/systems/unix-pthreads/lock-impl.c
(jcondvar_wait): Renamed stat to status to fix a compiler
warning and clarify code.
Members:
ChangeLog:1.2158->1.2159
kaffe/kaffevm/systems/unix-pthreads/lock-impl.c:1.6->1.7
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2158 kaffe/ChangeLog:1.2159
--- kaffe/ChangeLog:1.2158 Thu Mar 25 10:14:44 2004
+++ kaffe/ChangeLog Thu Mar 25 10:40:16 2004
@@ -1,5 +1,11 @@
2004-03-25 Dalibor Topic <robilad@kaffe.org>
+ * kaffe/kaffevm/systems/unix-pthreads/lock-impl.c
+ (jcondvar_wait): Renamed stat to status to fix a compiler
+ warning and clarify code.
+
+2004-03-25 Dalibor Topic <robilad@kaffe.org>
+
* include/jsyscall.h:
Include header files with the required types instead of
declaring them as structs.
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.c
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.c:1.6 kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.c:1.7
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.c:1.6 Sun Feb 1 22:14:55 2004
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/lock-impl.c Thu Mar 25 10:40:17 2004
@@ -36,7 +36,7 @@
jcondvar_wait ( jcondvar* cv, jmutex *mux, jlong timeout )
{
jthread_t cur = jthread_current();
- int stat;
+ int status;
struct timespec abst;
struct timeval now;
@@ -47,7 +47,7 @@
if ( timeout == NOTIMEOUT ) {
/* we handle this as "wait forever" */
cur->blockState |= BS_CV;
- stat = pthread_cond_wait( cv, mux );
+ status = pthread_cond_wait( cv, mux );
cur->blockState &= ~BS_CV;
}
else {
@@ -57,7 +57,7 @@
if( abst.tv_sec < now.tv_sec ) {
/* huge timeout value, we handle this as "wait forever" */
cur->blockState |= BS_CV;
- stat = pthread_cond_wait( cv, mux );
+ status = pthread_cond_wait( cv, mux );
cur->blockState &= ~BS_CV;
}
else {
@@ -69,11 +69,11 @@
}
cur->blockState |= BS_CV_TO;
- stat = pthread_cond_timedwait( cv, mux, &abst);
+ status = pthread_cond_timedwait( cv, mux, &abst);
cur->blockState &= ~BS_CV_TO;
}
}
- return (stat == 0);
+ return (status == 0);
}