summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-15 11:49:06 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-15 11:49:06 +0000
commit7cd76ab0c579ee5400d0d33753369e675b497d36 (patch)
treed35212b88b3af66efc3eada3fd4c4e114317d431 /ext
parent64f9f1ba5884975ba91abcdb7697988ba0ba64bf (diff)
* internal.h: Include ruby.h and ruby/encoding.h to be
includable without prior inclusion. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/-test-/bignum/big2str.c1
-rw-r--r--ext/-test-/bignum/bigzero.c1
-rw-r--r--ext/-test-/bignum/depend12
-rw-r--r--ext/-test-/bignum/div.c1
-rw-r--r--ext/-test-/bignum/intpack.c1
-rw-r--r--ext/-test-/bignum/mul.c1
-rw-r--r--ext/-test-/bignum/str2big.c1
-rw-r--r--ext/-test-/rational/depend5
-rw-r--r--ext/-test-/rational/rat.c1
-rw-r--r--ext/-test-/string/depend2
-rw-r--r--ext/-test-/string/normalize.c1
-rw-r--r--ext/coverage/depend2
-rw-r--r--ext/objspace/depend5
-rw-r--r--ext/objspace/object_tracing.c3
-rw-r--r--ext/objspace/objspace.c3
-rw-r--r--ext/objspace/objspace_dump.c4
-rw-r--r--ext/pty/depend1
-rw-r--r--ext/pty/pty.c3
-rw-r--r--ext/readline/depend1
-rw-r--r--ext/readline/readline.c3
-rw-r--r--ext/ripper/depend1
-rw-r--r--ext/socket/depend15
22 files changed, 49 insertions, 19 deletions
diff --git a/ext/-test-/bignum/big2str.c b/ext/-test-/bignum/big2str.c
index ce71fe3..ec4bde2 100644
--- 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
index a3bf8af..35117db 100644
--- 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
index 8f1660c..b960ff5 100644
--- 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
index 2853ebe..a1db21d 100644
--- 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
index b7435b2..2d19442 100644
--- 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
index c0514a5..d34e98f 100644
--- 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
index 0fdcb53..bc79ef0 100644
--- 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
index a435890..a814c2e 100644
--- 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
index 63ca849..772546f 100644
--- 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
index 8a1c2c3..ac2bd6f 100644
--- 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
index 22bb6d7..2e16a46 100644
--- 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
index 50c355c..6a14155 100644
--- 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
index 23d7081..297e3bd 100644
--- 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
index 975518c..3a7f544 100644
--- 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
index 88ebfca..c423723 100644
--- 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
index cb8f943..7e082f9 100644
--- 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
index 2fec612..8ae219d 100644
--- 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
index 18983f4..29cc689 100644
--- 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
diff --git a/ext/readline/depend b/ext/readline/depend
index 40d1bbd..a5ea0a5 100644
--- a/ext/readline/depend
+++ b/ext/readline/depend
@@ -11,4 +11,5 @@ readline.o: $(hdrdir)/ruby/ruby.h
readline.o: $(hdrdir)/ruby/st.h
readline.o: $(hdrdir)/ruby/subst.h
readline.o: $(hdrdir)/ruby/thread.h
+readline.o: $(top_srcdir)/include/ruby.h
# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index a196399..5e78af4 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -33,10 +33,9 @@
#include <editline/readline.h>
#endif
-#include "ruby/ruby.h"
+#include "internal.h"
#include "ruby/io.h"
#include "ruby/thread.h"
-#include "internal.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
diff --git a/ext/ripper/depend b/ext/ripper/depend
index db2dd15..8559362 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -68,4 +68,5 @@ ripper.o: $(hdrdir)/ruby/ruby.h
ripper.o: $(hdrdir)/ruby/st.h
ripper.o: $(hdrdir)/ruby/subst.h
ripper.o: $(hdrdir)/ruby/util.h
+ripper.o: $(top_srcdir)/include/ruby.h
# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/socket/depend b/ext/socket/depend
index 9661c0c..2a68d96 100644
--- a/ext/socket/depend
+++ b/ext/socket/depend
@@ -247,4 +247,19 @@ unixsocket.o: $(hdrdir)/ruby/st.h
unixsocket.o: $(hdrdir)/ruby/subst.h
unixsocket.o: $(hdrdir)/ruby/thread.h
unixsocket.o: $(hdrdir)/ruby/util.h
+ancdata.o: $(top_srcdir)/include/ruby.h
+basicsocket.o: $(top_srcdir)/include/ruby.h
+constants.o: $(top_srcdir)/include/ruby.h
+ifaddr.o: $(top_srcdir)/include/ruby.h
+init.o: $(top_srcdir)/include/ruby.h
+ipsocket.o: $(top_srcdir)/include/ruby.h
+option.o: $(top_srcdir)/include/ruby.h
+raddrinfo.o: $(top_srcdir)/include/ruby.h
+socket.o: $(top_srcdir)/include/ruby.h
+sockssocket.o: $(top_srcdir)/include/ruby.h
+tcpserver.o: $(top_srcdir)/include/ruby.h
+tcpsocket.o: $(top_srcdir)/include/ruby.h
+udpsocket.o: $(top_srcdir)/include/ruby.h
+unixserver.o: $(top_srcdir)/include/ruby.h
+unixsocket.o: $(top_srcdir)/include/ruby.h
# AUTOGENERATED DEPENDENCIES END