kazu	2018-01-09 21:35:12 +0900 (Tue, 09 Jan 2018)

  New Revision: 61725

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61725

  Log:
    Include ruby/{io,encoding}.h before internal.h
    
    because of r61712 and r61713

  Modified files:
    trunk/ext/objspace/objspace.c
    trunk/ext/objspace/objspace_dump.c
    trunk/ext/pty/pty.c
    trunk/include/ruby/encoding.h
    trunk/include/ruby/io.h
    trunk/marshal.c
    trunk/process.c
    trunk/thread.c
Index: include/ruby/io.h
===================================================================
--- include/ruby/io.h	(revision 61724)
+++ include/ruby/io.h	(revision 61725)
@@ -12,6 +12,10 @@ https://github.com/ruby/ruby/blob/trunk/include/ruby/io.h#L12
 #ifndef RUBY_IO_H
 #define RUBY_IO_H 1
 
+#ifdef RUBY_INTERNAL_H
+#error "Include this file before internal.h"
+#endif
+
 #if defined(__cplusplus)
 extern "C" {
 #if 0
Index: include/ruby/encoding.h
===================================================================
--- include/ruby/encoding.h	(revision 61724)
+++ include/ruby/encoding.h	(revision 61725)
@@ -12,6 +12,10 @@ https://github.com/ruby/ruby/blob/trunk/include/ruby/encoding.h#L12
 #ifndef RUBY_ENCODING_H
 #define RUBY_ENCODING_H 1
 
+#ifdef RUBY_INTERNAL_H
+#error "Include this file before internal.h"
+#endif
+
 #if defined(__cplusplus)
 extern "C" {
 #if 0
Index: thread.c
===================================================================
--- thread.c	(revision 61724)
+++ thread.c	(revision 61725)
@@ -63,10 +63,11 @@ https://github.com/ruby/ruby/blob/trunk/thread.c#L63
 
 /* for model 2 */
 
+#include "ruby/config.h"
+#include "ruby/io.h"
 #include "eval_intern.h"
 #include "gc.h"
 #include "timev.h"
-#include "ruby/io.h"
 #include "ruby/thread.h"
 #include "ruby/thread_native.h"
 #include "ruby/debug.h"
Index: process.c
===================================================================
--- process.c	(revision 61724)
+++ process.c	(revision 61725)
@@ -11,8 +11,9 @@ https://github.com/ruby/ruby/blob/trunk/process.c#L11
 
 **********************************************************************/
 
-#include "internal.h"
+#include "ruby/config.h"
 #include "ruby/io.h"
+#include "internal.h"
 #include "ruby/thread.h"
 #include "ruby/util.h"
 #include "vm_core.h"
Index: ext/objspace/objspace.c
===================================================================
--- ext/objspace/objspace.c	(revision 61724)
+++ ext/objspace/objspace.c	(revision 61725)
@@ -12,9 +12,9 @@ https://github.com/ruby/ruby/blob/trunk/ext/objspace/objspace.c#L12
 
 **********************************************************************/
 
+#include <ruby/io.h>
 #include "internal.h"
 #include <ruby/st.h>
-#include <ruby/io.h>
 #include <ruby/re.h>
 #include "node.h"
 #include "gc.h"
Index: ext/objspace/objspace_dump.c
===================================================================
--- ext/objspace/objspace_dump.c	(revision 61724)
+++ ext/objspace/objspace_dump.c	(revision 61725)
@@ -12,9 +12,9 @@ https://github.com/ruby/ruby/blob/trunk/ext/objspace/objspace_dump.c#L12
 
 **********************************************************************/
 
+#include "ruby/io.h"
 #include "internal.h"
 #include "ruby/debug.h"
-#include "ruby/io.h"
 #include "gc.h"
 #include "node.h"
 #include "vm_core.h"
Index: ext/pty/pty.c
===================================================================
--- ext/pty/pty.c	(revision 61724)
+++ ext/pty/pty.c	(revision 61725)
@@ -35,8 +35,8 @@ https://github.com/ruby/ruby/blob/trunk/ext/pty/pty.c#L35
 #endif
 #include <ctype.h>
 
-#include "internal.h"
 #include "ruby/io.h"
+#include "internal.h"
 #include "ruby/util.h"
 
 #include <signal.h>
Index: marshal.c
===================================================================
--- marshal.c	(revision 61724)
+++ marshal.c	(revision 61725)
@@ -13,8 +13,8 @@ https://github.com/ruby/ruby/blob/trunk/marshal.c#L13
 # error too old GCC
 #endif
 
-#include "internal.h"
 #include "ruby/io.h"
+#include "internal.h"
 #include "ruby/st.h"
 #include "ruby/util.h"
 #include "encindex.h"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/