diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a3a6f50d3f6..d3a4f41ad0b 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 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.
diff --git a/libjava/posix-threads.cc b/libjava/posix-threads.cc
index 791c43bc7bb..7e721c57711 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;