2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ab1f6ae077..38b5849dd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr  1 18:53:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_dump.c (rb_vm_bugreport): should not #include inside a
+	  function, since headers may have declarations.
+	  c.f. [ruby-core:23095]
+
 Wed Apr  1 18:44:53 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* mkconfig.rb: ignores version numbers in config.status.  replaces
diff --git a/vm_dump.c b/vm_dump.c
index 7aae51090e..191dbc4c2b 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -576,6 +576,9 @@ bugreport_backtrace(void *arg, const char *file, int line, const char *method)
     return 0;
 }
 
+#if HAVE_BACKTRACE
+#include <execinfo.h>
+#endif
 void
 rb_vm_bugreport(void)
 {
@@ -589,7 +592,6 @@ rb_vm_bugreport(void)
     }
 
 #if HAVE_BACKTRACE
-#include <execinfo.h>
 #define MAX_NATIVE_TRACE 1024
     {
 	static void *trace[MAX_NATIVE_TRACE];