diff options
| author | Tom Tromey <tromey@cygnus.com> | 1999-08-24 04:01:06 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 1999-08-24 04:01:06 +0000 |
| commit | 657ac7664ccb23e3d8c45ca4932a6226fef076de (patch) | |
| tree | d25d3c6e4e71e72f48f581516593e6a0e2a8e531 | |
| parent | 7b5efe21a0624c7340186c58df5ab3b722eafa91 (diff) | |
| download | gcc-657ac7664ccb23e3d8c45ca4932a6226fef076de.zip gcc-657ac7664ccb23e3d8c45ca4932a6226fef076de.tar.gz gcc-657ac7664ccb23e3d8c45ca4932a6226fef076de.tar.bz2 | |
boehm.cc: Undefine TRUE and FALSE.
* boehm.cc: Undefine TRUE and FALSE.
* posix-threads.cc (_Jv_CondWait): Use ETIMEDOUT, not ETIME.
From-SVN: r28810
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/boehm.cc | 5 | ||||
| -rw-r--r-- | libjava/posix-threads.cc | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a3a6f50..d3a4f41 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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 diff --git a/libjava/boehm.cc b/libjava/boehm.cc index f73bf86..8d1e974 100644 --- a/libjava/boehm.cc +++ b/libjava/boehm.cc @@ -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. diff --git a/libjava/posix-threads.cc b/libjava/posix-threads.cc index 791c43b..7e721c5 100644 --- a/libjava/posix-threads.cc +++ b/libjava/posix-threads.cc @@ -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; |