diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-08-24 04:01:06 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-08-24 04:01:06 +0000 |
commit | f1ea3dc717906eaf2ebcf4d1251312099636cc08 (patch) | |
tree | d25d3c6e4e71e72f48f581516593e6a0e2a8e531 /libjava/boehm.cc | |
parent | 5701cb15a558f17afe145e06ab59f863944c36a0 (diff) | |
download | gcc-f1ea3dc717906eaf2ebcf4d1251312099636cc08.tar.gz |
* boehm.cc: Undefine TRUE and FALSE.
* posix-threads.cc (_Jv_CondWait): Use ETIMEDOUT, not ETIME.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@28810 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/boehm.cc')
-rw-r--r-- | libjava/boehm.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libjava/boehm.cc b/libjava/boehm.cc index f73bf868017..8d1e97442e9 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. |