diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3e20f1643e7fb09a4db58e242bcb0658f839a3f7..111c5e9ab91f3e8a66e7d1f3b0b1eb301e3202aa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+Sun Oct 31 23:42:37 1999  Mark Mitchell  <mark@codesourcery.com>
+
+	* toplev.c (rest_of_compilation): Fix thinko in this change:
+	
+	Fri Oct 29 15:25:07 1999  Arnaud Charlet  <charlet@ACT-Europe.FR>
+
+	(rest_of_compilation): If inside an inlined external function,
+	pretend we are just being declared.
+
 Sun Oct 31 23:03:25 1999  Jeffrey A Law  (law@cygnus.com)
 
         * integrate.c (expand_inline_function): Fix bugs in previous
diff --git a/gcc/toplev.c b/gcc/toplev.c
index ea4631a5cd1d5046f47351ecb458ba74f5f238ec..64fc23e1df4543ee44fa0ed16602c11bd612cc6a 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -3586,7 +3586,8 @@ rest_of_compilation (decl)
 	 confuse some debugging output writers.  */
       for (parent = DECL_CONTEXT (current_function_decl);
 	   parent != 0; parent = DECL_CONTEXT (parent))
-	if (DECL_INLINE (parent) && DECL_EXTERNAL (parent))
+	if (TREE_CODE (parent) == FUNCTION_DECL
+	    && DECL_INLINE (parent) && DECL_EXTERNAL (parent))
 	  {
 	    DECL_INITIAL (decl) = 0;
 	    goto exit_rest_of_compilation;