diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9d75e321b45..d8c9992bdbd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-12  Zack Weinberg  <zack@codesourcery.com>
+
+	* dbxout.c: Move declaration of dbxout_type_decl outside
+	#ifdef DBX_DEBUGGING_INFO.
+	* c-parse.in: Don't give the asmdef production a type.
+
 2004-02-12  Zack Weinberg  <zack@codesourcery.com>
 
 	* debug.h (struct gcc_debug_hooks): Add type_decl field.
diff --git a/gcc/c-parse.in b/gcc/c-parse.in
index 7a68dbf077f..59440857508 100644
--- a/gcc/c-parse.in
+++ b/gcc/c-parse.in
@@ -202,7 +202,7 @@ do {									\
 
 %type <ttype> scspec SCSPEC STATIC TYPESPEC TYPE_QUAL maybe_volatile
 %type <ttype> initdecls notype_initdecls initdcl notype_initdcl init
-%type <ttype> simple_asm_expr maybeasm asmdef asm_stmt asm_argument
+%type <ttype> simple_asm_expr maybeasm asm_stmt asm_argument
 %type <ttype> asm_operands nonnull_asm_operands asm_operand asm_clobbers
 %type <ttype> maybe_attribute attributes attribute attribute_list attrib
 %type <ttype> any_word
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index 0fe6c0bd2c8..899d2cd7cff 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -365,6 +365,7 @@ static void dbxout_prepare_symbol (tree);
 static void dbxout_finish_symbol (tree);
 static void dbxout_block (tree, int, tree);
 static void dbxout_global_decl (tree);
+static void dbxout_type_decl (tree, int);
 static void dbxout_handle_pch (unsigned);
 
 /* The debug hooks structure.  */
@@ -377,7 +378,6 @@ static void dbxout_begin_function (tree);
 static void dbxout_begin_block (unsigned, unsigned);
 static void dbxout_end_block (unsigned, unsigned);
 static void dbxout_function_decl (tree);
-static void dbxout_type_decl (tree, int);
 
 const struct gcc_debug_hooks dbx_debug_hooks =
 {