* internal.h: Include ruby.h and ruby/encoding.h to be

includable without prior inclusion. git-svn-id: svn+ssh:https://ci.ruby-lang.org/ruby/trunk@48447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
marshmeryl · Nov 15, 2014 · 7cd76ab · 7cd76ab
1 parent 64f9f1b
commit 7cd76ab
Show file tree

Hide file tree

Showing 70 changed files with 186 additions and 116 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov 15 20:34:23 2014 Tanaka Akira <[email protected]>
+
+ * internal.h: Include ruby.h and ruby/encoding.h to be
+ includable without prior inclusion.
+
 Sat Nov 15 20:46:44 2014 Kouhei Sutou <[email protected]>
 
  * test/rexml/test_document.rb

diff --git a/array.c b/array.c
@@ -11,11 +11,9 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "internal.h"
 #include "ruby/util.h"
 #include "ruby/st.h"
-#include "ruby/encoding.h"
-#include "internal.h"
 #include "probes.h"
 #include "id.h"
 

diff --git a/bignum.c b/bignum.c
@@ -9,10 +9,9 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "internal.h"
 #include "ruby/thread.h"
 #include "ruby/util.h"
-#include "internal.h"
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>

diff --git a/class.c b/class.c
@@ -23,12 +23,11 @@
  * \{
  */
 
-#include "ruby/ruby.h"
+#include "internal.h"
 #include "ruby/st.h"
 #include "method.h"
 #include "constant.h"
 #include "vm_core.h"
-#include "internal.h"
 #include <ctype.h>
 
 int rb_vm_add_root_module(ID id, VALUE module);

diff --git a/common.mk b/common.mk
@@ -2091,4 +2091,104 @@ vm_trace.$(OBJEXT): {$(VPATH)}thread_native.h
 vm_trace.$(OBJEXT): {$(VPATH)}vm_core.h
 vm_trace.$(OBJEXT): {$(VPATH)}vm_debug.h
 vm_trace.$(OBJEXT): {$(VPATH)}vm_opts.h
+array.$(OBJEXT): $(hdrdir)/ruby.h
+bignum.$(OBJEXT): $(hdrdir)/ruby.h
+bignum.$(OBJEXT): {$(VPATH)}encoding.h
+bignum.$(OBJEXT): {$(VPATH)}oniguruma.h
+class.$(OBJEXT): $(hdrdir)/ruby.h
+class.$(OBJEXT): {$(VPATH)}encoding.h
+class.$(OBJEXT): {$(VPATH)}oniguruma.h
+compile.$(OBJEXT): $(hdrdir)/ruby.h
+compile.$(OBJEXT): {$(VPATH)}encoding.h
+compile.$(OBJEXT): {$(VPATH)}oniguruma.h
+complex.$(OBJEXT): {$(VPATH)}encoding.h
+complex.$(OBJEXT): {$(VPATH)}oniguruma.h
+cont.$(OBJEXT): $(hdrdir)/ruby.h
+cont.$(OBJEXT): {$(VPATH)}encoding.h
+cont.$(OBJEXT): {$(VPATH)}oniguruma.h
+debug.$(OBJEXT): $(hdrdir)/ruby.h
+dir.$(OBJEXT): $(hdrdir)/ruby.h
+encoding.$(OBJEXT): $(hdrdir)/ruby.h
+enum.$(OBJEXT): $(hdrdir)/ruby.h
+enum.$(OBJEXT): {$(VPATH)}encoding.h
+enum.$(OBJEXT): {$(VPATH)}oniguruma.h
+enumerator.$(OBJEXT): $(hdrdir)/ruby.h
+enumerator.$(OBJEXT): {$(VPATH)}encoding.h
+enumerator.$(OBJEXT): {$(VPATH)}oniguruma.h
+error.$(OBJEXT): $(hdrdir)/ruby.h
+eval.$(OBJEXT): $(hdrdir)/ruby.h
+file.$(OBJEXT): $(hdrdir)/ruby.h
+gc.$(OBJEXT): $(hdrdir)/ruby.h
+golf_prelude.$(OBJEXT): $(hdrdir)/ruby.h
+golf_prelude.$(OBJEXT): {$(VPATH)}encoding.h
+golf_prelude.$(OBJEXT): {$(VPATH)}oniguruma.h
+hash.$(OBJEXT): $(hdrdir)/ruby.h
+inits.$(OBJEXT): $(hdrdir)/ruby.h
+inits.$(OBJEXT): {$(VPATH)}encoding.h
+inits.$(OBJEXT): {$(VPATH)}oniguruma.h
+io.$(OBJEXT): $(hdrdir)/ruby.h
+iseq.$(OBJEXT): $(hdrdir)/ruby.h
+iseq.$(OBJEXT): {$(VPATH)}encoding.h
+iseq.$(OBJEXT): {$(VPATH)}oniguruma.h
+load.$(OBJEXT): $(hdrdir)/ruby.h
+load.$(OBJEXT): {$(VPATH)}encoding.h
+load.$(OBJEXT): {$(VPATH)}oniguruma.h
+localeinit.$(OBJEXT): $(hdrdir)/ruby.h
+marshal.$(OBJEXT): $(hdrdir)/ruby.h
+math.$(OBJEXT): $(hdrdir)/ruby.h
+math.$(OBJEXT): {$(VPATH)}encoding.h
+math.$(OBJEXT): {$(VPATH)}oniguruma.h
+miniprelude.$(OBJEXT): $(hdrdir)/ruby.h
+miniprelude.$(OBJEXT): {$(VPATH)}encoding.h
+miniprelude.$(OBJEXT): {$(VPATH)}oniguruma.h
+node.$(OBJEXT): $(hdrdir)/ruby.h
+node.$(OBJEXT): {$(VPATH)}encoding.h
+node.$(OBJEXT): {$(VPATH)}oniguruma.h
+numeric.$(OBJEXT): $(hdrdir)/ruby.h
+object.$(OBJEXT): $(hdrdir)/ruby.h
+pack.$(OBJEXT): $(hdrdir)/ruby.h
+parse.$(OBJEXT): $(hdrdir)/ruby.h
+prelude.$(OBJEXT): $(hdrdir)/ruby.h
+prelude.$(OBJEXT): {$(VPATH)}encoding.h
+prelude.$(OBJEXT): {$(VPATH)}oniguruma.h
+proc.$(OBJEXT): $(hdrdir)/ruby.h
+proc.$(OBJEXT): {$(VPATH)}encoding.h
+proc.$(OBJEXT): {$(VPATH)}oniguruma.h
+process.$(OBJEXT): $(hdrdir)/ruby.h
+random.$(OBJEXT): $(hdrdir)/ruby.h
+random.$(OBJEXT): {$(VPATH)}encoding.h
+random.$(OBJEXT): {$(VPATH)}oniguruma.h
+range.$(OBJEXT): $(hdrdir)/ruby.h
+rational.$(OBJEXT): {$(VPATH)}encoding.h
+rational.$(OBJEXT): {$(VPATH)}oniguruma.h
+re.$(OBJEXT): $(hdrdir)/ruby.h
+ruby.$(OBJEXT): $(hdrdir)/ruby.h
+safe.$(OBJEXT): $(hdrdir)/ruby.h
+safe.$(OBJEXT): {$(VPATH)}encoding.h
+safe.$(OBJEXT): {$(VPATH)}oniguruma.h
+signal.$(OBJEXT): $(hdrdir)/ruby.h
+signal.$(OBJEXT): {$(VPATH)}encoding.h
+signal.$(OBJEXT): {$(VPATH)}oniguruma.h
+sprintf.$(OBJEXT): $(hdrdir)/ruby.h
+st.$(OBJEXT): $(hdrdir)/ruby.h
+st.$(OBJEXT): {$(VPATH)}encoding.h
+st.$(OBJEXT): {$(VPATH)}oniguruma.h
+string.$(OBJEXT): $(hdrdir)/ruby.h
+struct.$(OBJEXT): $(hdrdir)/ruby.h
+struct.$(OBJEXT): {$(VPATH)}encoding.h
+struct.$(OBJEXT): {$(VPATH)}oniguruma.h
+symbol.$(OBJEXT): $(hdrdir)/ruby.h
+thread.$(OBJEXT): $(hdrdir)/ruby.h
+time.$(OBJEXT): $(hdrdir)/ruby.h
+transcode.$(OBJEXT): $(hdrdir)/ruby.h
+util.$(OBJEXT): $(hdrdir)/ruby.h
+util.$(OBJEXT): {$(VPATH)}encoding.h
+util.$(OBJEXT): {$(VPATH)}oniguruma.h
+variable.$(OBJEXT): $(hdrdir)/ruby.h
+vm.$(OBJEXT): $(hdrdir)/ruby.h
+vm_backtrace.$(OBJEXT): $(hdrdir)/ruby.h
+vm_dump.$(OBJEXT): $(hdrdir)/ruby.h
+vm_dump.$(OBJEXT): {$(VPATH)}encoding.h
+vm_dump.$(OBJEXT): {$(VPATH)}oniguruma.h
+vm_trace.$(OBJEXT): $(hdrdir)/ruby.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/compile.c b/compile.c
@@ -9,7 +9,6 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
 #include "internal.h"
 #include <math.h>
 

diff --git a/complex.c b/complex.c
@@ -5,7 +5,6 @@
  which is written in ruby.
 */
 
-#include "ruby.h"
 #include "internal.h"
 #include <math.h>
 

diff --git a/cont.c b/cont.c
@@ -9,7 +9,6 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
 #include "internal.h"
 #include "vm_core.h"
 #include "gc.h"

diff --git a/dir.c b/dir.c
@@ -11,8 +11,6 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
 #include "internal.h"
 
 #include <sys/types.h>

diff --git a/encoding.c b/encoding.c
@@ -9,8 +9,6 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
 #include "internal.h"
 #include "regenc.h"
 #include <ctype.h>

diff --git a/enum.c b/enum.c
@@ -9,11 +9,10 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "internal.h"
 #include "ruby/util.h"
 #include "node.h"
 #include "id.h"
-#include "internal.h"
 
 VALUE rb_f_send(int argc, VALUE *argv, VALUE recv);
 

diff --git a/enumerator.c b/enumerator.c
@@ -12,9 +12,8 @@
 
 ************************************************/
 
-#include "ruby/ruby.h"
-#include "node.h"
 #include "internal.h"
+#include "node.h"
 
 /*
  * Document-class: Enumerator

diff --git a/error.c b/error.c
@@ -9,10 +9,8 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/st.h"
-#include "ruby/encoding.h"
 #include "internal.h"
+#include "ruby/st.h"
 #include "vm_core.h"
 
 #include <stdio.h>

diff --git a/eval.c b/eval.c
@@ -11,12 +11,11 @@
 
 **********************************************************************/
 
+#include "internal.h"
 #include "eval_intern.h"
 #include "iseq.h"
 #include "gc.h"
 #include "ruby/vm.h"
-#include "ruby/encoding.h"
-#include "internal.h"
 #include "vm_core.h"
 #include "probes_helper.h"
 

diff --git a/ext/-test-/bignum/big2str.c b/ext/-test-/bignum/big2str.c
@@ -1,4 +1,3 @@
-#include "ruby.h"
 #include "internal.h"
 
 static VALUE

diff --git a/ext/-test-/bignum/bigzero.c b/ext/-test-/bignum/bigzero.c
@@ -1,4 +1,3 @@
-#include "ruby.h"
 #include "internal.h"
 
 static VALUE

diff --git a/ext/-test-/bignum/depend b/ext/-test-/bignum/depend
@@ -67,4 +67,16 @@ str2big.o: $(hdrdir)/ruby/missing.h
 str2big.o: $(hdrdir)/ruby/ruby.h
 str2big.o: $(hdrdir)/ruby/st.h
 str2big.o: $(hdrdir)/ruby/subst.h
+big2str.o: $(hdrdir)/ruby/encoding.h
+big2str.o: $(hdrdir)/ruby/oniguruma.h
+bigzero.o: $(hdrdir)/ruby/encoding.h
+bigzero.o: $(hdrdir)/ruby/oniguruma.h
+div.o: $(hdrdir)/ruby/encoding.h
+div.o: $(hdrdir)/ruby/oniguruma.h
+intpack.o: $(hdrdir)/ruby/encoding.h
+intpack.o: $(hdrdir)/ruby/oniguruma.h
+mul.o: $(hdrdir)/ruby/encoding.h
+mul.o: $(hdrdir)/ruby/oniguruma.h
+str2big.o: $(hdrdir)/ruby/encoding.h
+str2big.o: $(hdrdir)/ruby/oniguruma.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/bignum/div.c b/ext/-test-/bignum/div.c
@@ -1,4 +1,3 @@
-#include "ruby.h"
 #include "internal.h"
 
 static VALUE

diff --git a/ext/-test-/bignum/intpack.c b/ext/-test-/bignum/intpack.c
@@ -1,4 +1,3 @@
-#include "ruby.h"
 #include "internal.h"
 
 static VALUE

diff --git a/ext/-test-/bignum/mul.c b/ext/-test-/bignum/mul.c
@@ -1,4 +1,3 @@
-#include "ruby.h"
 #include "internal.h"
 
 static VALUE

diff --git a/ext/-test-/bignum/str2big.c b/ext/-test-/bignum/str2big.c
@@ -1,4 +1,3 @@
-#include "ruby.h"
 #include "internal.h"
 
 static VALUE

diff --git a/ext/-test-/rational/depend b/ext/-test-/rational/depend
@@ -1,3 +1,8 @@
 $(OBJS): $(HDRS) $(ruby_headers)
 
 rat.o: rat.c $(top_srcdir)/internal.h
+
+# AUTOGENERATED DEPENDENCIES START
+rat.o: $(hdrdir)/ruby/encoding.h
+rat.o: $(hdrdir)/ruby/oniguruma.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/rational/rat.c b/ext/-test-/rational/rat.c
@@ -1,4 +1,3 @@
-#include "ruby.h"
 #include "internal.h"
 
 #if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)

diff --git a/ext/-test-/string/depend b/ext/-test-/string/depend
@@ -89,4 +89,6 @@ set_len.o: $(hdrdir)/ruby/missing.h
 set_len.o: $(hdrdir)/ruby/ruby.h
 set_len.o: $(hdrdir)/ruby/st.h
 set_len.o: $(hdrdir)/ruby/subst.h
+normalize.o: $(hdrdir)/ruby/encoding.h
+normalize.o: $(hdrdir)/ruby/oniguruma.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/string/normalize.c b/ext/-test-/string/normalize.c
@@ -1,4 +1,3 @@
-#include "ruby.h"
 #include "internal.h"
 
 #ifdef __APPLE__

diff --git a/ext/coverage/depend b/ext/coverage/depend
@@ -15,4 +15,6 @@ coverage.o: $(top_srcdir)/ccan/check_type/check_type.h
 coverage.o: $(top_srcdir)/ccan/container_of/container_of.h
 coverage.o: $(top_srcdir)/ccan/list/list.h
 coverage.o: $(top_srcdir)/ccan/str/str.h
+coverage.o: $(hdrdir)/ruby/encoding.h
+coverage.o: $(hdrdir)/ruby/oniguruma.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/objspace/depend b/ext/objspace/depend
@@ -51,4 +51,9 @@ objspace_dump.o: $(hdrdir)/ruby/missing.h
 objspace_dump.o: $(hdrdir)/ruby/ruby.h
 objspace_dump.o: $(hdrdir)/ruby/st.h
 objspace_dump.o: $(hdrdir)/ruby/subst.h
+object_tracing.o: $(top_srcdir)/include/ruby.h
+object_tracing.o: $(hdrdir)/ruby/encoding.h
+object_tracing.o: $(hdrdir)/ruby/oniguruma.h
+objspace.o: $(top_srcdir)/include/ruby.h
+objspace_dump.o: $(top_srcdir)/include/ruby.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/objspace/object_tracing.c b/ext/objspace/object_tracing.c
@@ -13,10 +13,9 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "internal.h"
 #include "ruby/debug.h"
 #include "objspace.h"
-#include "internal.h"
 
 struct traceobj_arg {
  int running;

diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
@@ -12,13 +12,12 @@
 
 **********************************************************************/
 
-#include <ruby/ruby.h>
+#include "internal.h"
 #include <ruby/st.h>
 #include <ruby/io.h>
 #include <ruby/re.h>
 #include "node.h"
 #include "gc.h"
-#include "internal.h"
 
 /*
  * call-seq:

diff --git a/ext/objspace/objspace_dump.c b/ext/objspace/objspace_dump.c
@@ -12,15 +12,13 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "internal.h"
 #include "ruby/debug.h"
-#include "ruby/encoding.h"
 #include "ruby/io.h"
 #include "gc.h"
 #include "node.h"
 #include "vm_core.h"
 #include "objspace.h"
-#include "internal.h"
 
 static VALUE sym_output, sym_stdout, sym_string, sym_file;
 

diff --git a/ext/pty/depend b/ext/pty/depend
@@ -11,4 +11,5 @@ pty.o: $(hdrdir)/ruby/ruby.h
 pty.o: $(hdrdir)/ruby/st.h
 pty.o: $(hdrdir)/ruby/subst.h
 pty.o: $(hdrdir)/ruby/util.h
+pty.o: $(top_srcdir)/include/ruby.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
@@ -33,10 +33,9 @@
 #endif
 #include <ctype.h>
 
-#include "ruby/ruby.h"
+#include "internal.h"
 #include "ruby/io.h"
 #include "ruby/util.h"
-#include "internal.h"
 
 #include <signal.h>
 #ifdef HAVE_SYS_STROPTS_H