diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ea7e3282f47..13fb2d652c7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-09  Geoff Keating  <geoffk@cygnus.com>
+
+	* tree.h (VOID_TYPE_P): Don't look at the TYPE_MAIN_VARIANT
+	of an error_type_node.
+
 Fri Jun  9 20:35:13 2000  Denis Chertykov  <denisc@overta.ru>
 
 	* config/avr/avr.c (asm_output_section_name): bugfix.
@@ -319,12 +324,12 @@ Mon Jun  5 06:46:28 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 	* Makefile.in (intl.*): Honor non-zero exit codes in the intl
 	subdir.
 
-S2000-06-03  Geoff Keating  <geoffk@cygnus.com>
+2000-06-03  Geoff Keating  <geoffk@cygnus.com>
 
         * alias.c (record_component_aliases): Don't inspect
         DECL_NONADDRESSABLE_P of non-FIELD_DECL components of structures.
 
-at Jun  3 19:05:30 2000  Michael Meissner  <meissner@redhat.com>
+Sat Jun  3 19:05:30 2000  Michael Meissner  <meissner@redhat.com>
 
 	* ifcvt.c (process_insns): If IFCVT_MODIFY_INSN is defined, call
 	it with the pattern to do machine dependent work.
diff --git a/gcc/tree.h b/gcc/tree.h
index 450dbd1164a..5648ecc9f05 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -454,7 +454,7 @@ extern void tree_class_check_failed PARAMS ((const tree, char,
 #define COMPLETE_TYPE_P(NODE) (TYPE_SIZE (NODE) != NULL_TREE)
 
 /* Nonzero if this type is the (possibly qualified) void type.  */
-#define VOID_TYPE_P(NODE) (TYPE_MAIN_VARIANT (NODE) == void_type_node)
+#define VOID_TYPE_P(NODE) (TREE_CODE (NODE) == VOID_TYPE)
 
 /* Nonzero if this type is complete or is cv void.  */
 #define COMPLETE_OR_VOID_TYPE_P(NODE) \