diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ffa88662867a758bacac2c7945209d6010800a39..4eca4b1f21cf56faa29319b8a3fb263a6f4b4c43 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 Sun Sep 17 10:46:17 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
+	* c-decl.c (grokdeclarator): Reorder tests to avoid looking at
+	TYPE_MAIN_VARIANT of ERROR_MARK.
+	* c-lex.c (readescape): Avoid using printf syntax we don't recognize.
+
 	* simplify-rtx.c (simplify_unary_operation): Add cases
 	FLOAT_EXTEND and FLOAT_TRUNCATE to ones that return 0.
 
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index b8421a7c4bc1db30d2ab9a65db12375b020fe9c6..1de1f9748c359af0ee6970feedb65b3115f814d6 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -4650,8 +4650,8 @@ grokdeclarator (declarator, declspecs, decl_context, initialized)
      controlled separately by its own initializer.  */
 
   if (type != 0 && typedef_type != 0
-      && TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (typedef_type)
-      && TREE_CODE (type) == ARRAY_TYPE && TYPE_DOMAIN (type) == 0)
+      && TREE_CODE (type) == ARRAY_TYPE && TYPE_DOMAIN (type) == 0
+      && TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (typedef_type))
     {
       type = build_array_type (TREE_TYPE (type), 0);
       if (size_varies)
diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index f853fd067e9be84b7f3b24edf9679e394a2c40f0..b1f555b8e6ead7838644a26108c81bf4ec161e58 100644
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -1009,7 +1009,7 @@ readescape (p, limit, cptr)
   if (ISGRAPH (c))
     pedwarn ("unknown escape sequence '\\%c'", c);
   else
-    pedwarn ("unknown escape sequence: '\\' followed by char 0x%.2x", c);
+    pedwarn ("unknown escape sequence: '\\' followed by char 0x%x", c);
 
   *cptr = c;
   return p;