2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index bb4c1e70bb..ef645d83e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 29 14:45:15 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_thread_struct): move forward declarations before
+	  used.
+
 Thu Oct 29 14:07:54 2015  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c (gc_mark_ptr): remove debug code for #11244.
diff --git a/vm_core.h b/vm_core.h
index 50fd3ee3d2..0684e85456 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -171,6 +171,10 @@ enum ruby_vm_throw_flags {
     VM_THROW_STATE_MASK = 0xff
 };
 
+/* forward declarations */
+struct rb_thread_struct;
+struct rb_control_frame_struct;
+
 /* iseq data type */
 typedef struct rb_compile_option_struct rb_compile_option_t;
 
@@ -191,10 +195,6 @@ union iseq_inline_storage_entry {
     struct iseq_inline_cache_entry cache;
 };
 
-/* to avoid warning */
-struct rb_thread_struct;
-struct rb_control_frame_struct;
-
 enum method_missing_reason {
     MISSING_NOENTRY   = 0x00,
     MISSING_PRIVATE   = 0x01,
@@ -624,13 +624,11 @@ struct rb_unblock_callback {
 
 struct rb_mutex_struct;
 
-struct rb_thread_struct;
 typedef struct rb_thread_list_struct{
     struct rb_thread_list_struct *next;
     struct rb_thread_struct *th;
 } rb_thread_list_t;
 
-
 typedef struct rb_ensure_entry {
     VALUE marker;
     VALUE (*e_proc)(ANYARGS);