OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

boehm.cc: Undefine TRUE and FALSE.

Browse Source 
* boehm.cc: Undefine TRUE and FALSE.

	* posix-threads.cc (_Jv_CondWait): Use ETIMEDOUT, not ETIME.

From-SVN: r28810
This commit is contained in:
Tom Tromey 1999-08-24 04:01:06 +00:00 committed by Tom Tromey
parent 7b5efe21a0
commit 657ac7664c
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
1999-08-23 Tom Tromey <tromey@cygnus.com>
* boehm.cc: Undefine TRUE and FALSE.
* posix-threads.cc (_Jv_CondWait): Use ETIMEDOUT, not ETIME.
1999-08-21 Tom Tromey <tromey@cygnus.com>
* posix-threads.cc (_Jv_CondWait): Treat a timeout as a normal

5
libjava/boehm.cc
View File

@ -18,6 +18,11 @@ details. */
#include <java-field.h>
#include <java-interp.h>
// More nastiness: the GC wants to define TRUE and FALSE. We don't
// need the Java definitions (themselves a hack), so we undefine them.
#undef TRUE
#undef FALSE
// We need to include gc_priv.h. However, it tries to include
// config.h if it hasn't already been included. So we force the
// inclusion of the Boehm config.h.

2
libjava/posix-threads.cc
View File

@ -92,7 +92,7 @@ _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu,
r = pthread_cond_timedwait (cv, pmu, &ts);
/* A timeout is a normal result. */
if (r && errno == ETIME)
if (r && errno == ETIMEDOUT)
r = 0;
}
return r;