Permalink
Browse files

* include/ruby: moved public headers.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 1b8a677 commit 2b592580bf65040373b55ff2ccc3b59a0a231a18 @nobu nobu committed Jun 10, 2007
Showing with 647 additions and 409 deletions.
  1. +4 −0 ChangeLog
  2. +4 −2 Makefile.in
  3. +3 −3 array.c
  4. +1 −1 bignum.c
  5. +2 −2 blockinlining.c
  6. +4 −4 class.c
  7. +85 −85 common.mk
  8. +1 −1 compar.c
  9. +2 −2 compile.c
  10. +22 −5 configure.in
  11. +1 −1 cont.c
  12. +1 −1 cygwin/GNUmakefile.in
  13. +1 −1 debug.c
  14. +2 −2 debug.h
  15. +2 −2 dir.c
  16. +3 −3 dln.c
  17. +3 −3 enum.c
  18. +1 −1 enumerator.c
  19. +2 −2 error.c
  20. +5 −5 eval_intern.h
  21. +1 −2 ext/bigdecimal/bigdecimal.c
  22. +1 −1 ext/digest/extconf.rb
  23. +3 −4 ext/dl/cptr.c
  24. +2 −3 ext/dl/dl.c
  25. +3 −1 ext/dl/extconf.rb
  26. +15 −9 ext/extmk.rb
  27. +3 −3 ext/iconv/iconv.c
  28. +2 −2 ext/json/ext/generator/generator.c
  29. +4 −4 ext/json/ext/parser/parser.c
  30. +4 −4 ext/json/ext/parser/parser.rl
  31. +2 −0 ext/openssl/extconf.rb
  32. +2 −0 ext/probeprofiler/extconf.rb
  33. +1 −1 ext/probeprofiler/probeprofiler.c
  34. +8 −8 ext/pty/pty.c
  35. +1 −5 ext/racc/cparse/cparse.c
  36. +1 −0 ext/racc/cparse/extconf.rb
  37. +4 −4 ext/readline/readline.c
  38. +4 −4 ext/ripper/depend
  39. +4 −2 ext/ripper/extconf.rb
  40. +1 −1 ext/sdbm/_sdbm.c
  41. +5 −3 ext/socket/depend
  42. +1 −1 ext/socket/getaddrinfo.c
  43. +1 −1 ext/socket/getnameinfo.c
  44. +4 −4 ext/socket/socket.c
  45. +2 −2 ext/stringio/depend
  46. +1 −2 ext/strscan/depend
  47. +2 −2 ext/strscan/strscan.c
  48. +1 −1 ext/syck/bytecode.c
  49. +1 −1 ext/syck/emitter.c
  50. +1 −1 ext/syck/handler.c
  51. +1 −1 ext/syck/implicit.c
  52. +1 −1 ext/syck/node.c
  53. +1 −1 ext/syck/rubyext.c
  54. +1 −1 ext/syck/syck.c
  55. +1 −1 ext/syck/syck.h
  56. +1 −1 ext/syck/token.c
  57. +1 −1 ext/syck/yaml2byte.c
  58. +2 −2 ext/syslog/syslog.c
  59. +2 −0 ext/tk/extconf.rb
  60. +1 −1 ext/tk/stubs.c
  61. +2 −3 ext/tk/tcltklib.c
  62. +1 −0 ext/tk/tkutil/extconf.rb
  63. +4 −5 ext/tk/tkutil/tkutil.c
  64. +7 −8 ext/win32ole/win32ole.c
  65. +4 −4 file.c
  66. +5 −5 gc.c
  67. +4 −4 hash.c
  68. +1 −0 include/ruby.h
  69. +18 −3 { → include/ruby}/defines.h
  70. +15 −1 { → include/ruby}/intern.h
  71. +17 −2 rubyio.h → include/ruby/io.h
  72. +17 −3 { → include/ruby}/missing.h
  73. +9 −3 { → include/ruby}/node.h
  74. +6 −0 { → include/ruby}/oniguruma.h
  75. +18 −3 { → include/ruby}/re.h
  76. +22 −4 { → include/ruby}/regex.h
  77. +5 −5 { → include/ruby}/ruby.h
  78. +17 −2 rubysig.h → include/ruby/signal.h
  79. +16 −3 { → include/ruby}/st.h
  80. +17 −3 { → include/ruby}/util.h
  81. +15 −1 {win32 → include/ruby}/win32.h
  82. +1 −0 include/rubyio.h
  83. +1 −0 include/rubysig.h
  84. +1 −1 inits.c
  85. +19 −12 instruby.rb
  86. +4 −4 io.c
  87. +2 −2 iseq.c
  88. +45 −21 lib/mkmf.rb
  89. +1 −1 main.c
  90. +4 −4 marshal.c
  91. +1 −1 math.c
  92. +1 −1 missing/flock.c
  93. +1 −1 missing/strftime.c
  94. +1 −1 numeric.c
  95. +6 −5 object.c
  96. +1 −1 pack.c
  97. +6 −6 parse.y
  98. +1 −1 prec.c
  99. +3 −3 process.c
  100. +1 −1 random.c
  101. +1 −1 range.c
  102. +2 −2 re.c
  103. +2 −2 regenc.h
  104. +3 −3 regint.h
  105. +1 −1 regparse.c
  106. +4 −4 ruby.c
  107. +3 −3 signal.c
  108. +2 −2 sprintf.c
  109. +5 −4 st.c
  110. +2 −2 string.c
  111. +1 −1 struct.c
  112. +1 −1 time.c
  113. +1 −1 unicode.c
  114. +2 −2 util.c
  115. +4 −4 variable.c
  116. +1 −1 version.c
  117. +3 −3 version.h
  118. +3 −3 vm.c
  119. +2 −2 vm_dump.c
  120. +27 −16 win32/Makefile.sub
  121. +2 −2 win32/mkexports.rb
  122. +3 −3 win32/win32.c
  123. +2 −2 yarvcore.c
  124. +4 −4 yarvcore.h
View
4 ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 10 12:07:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby: moved public headers.
+
Sun Jun 10 10:42:04 2007 Tanaka Akira <akr@fsij.org>
* lib/securerandom.rb: renamed from lib/secrand.rb.
View
6 Makefile.in
@@ -4,7 +4,7 @@ NULLCMD = :
#### Start of system configuration section. ####
srcdir = @srcdir@
-VPATH = $(srcdir):$(srcdir)/missing
+hdrdir = $(srcdir)/include
CC = @CC@
YACC = bison
@@ -32,11 +32,13 @@ RDOCTARGET = @RDOCTARGET@
EXTOUT = @EXTOUT@
RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
+arch_hdrdir = $(EXTOUT)/include/$(arch)
+VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing
empty =
OUTFLAG = @OUTFLAG@$(empty)
CFLAGS = @CFLAGS@ @ARCH_FLAG@
-XCFLAGS = -I. -I$(srcdir) @XCFLAGS@
+XCFLAGS = -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
EXTLDFLAGS =
View
6 array.c
@@ -12,9 +12,9 @@
**********************************************************************/
-#include "ruby.h"
-#include "util.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/util.h"
+#include "ruby/st.h"
VALUE rb_cArray;
View
2 bignum.c
@@ -10,7 +10,7 @@
**********************************************************************/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include <math.h>
#include <float.h>
View
4 blockinlining.c
@@ -9,8 +9,8 @@
**********************************************************************/
-#include "ruby.h"
-#include "node.h"
+#include "ruby/ruby.h"
+#include "ruby/node.h"
#include "yarvcore.h"
VALUE yarv_new_iseqval(VALUE node, VALUE name, VALUE file,
View
8 class.c
@@ -10,10 +10,10 @@
**********************************************************************/
-#include "ruby.h"
-#include "rubysig.h"
-#include "node.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/signal.h"
+#include "ruby/node.h"
+#include "ruby/st.h"
#include <ctype.h>
extern st_table *rb_class_tbl;
View
170 common.mk
@@ -370,218 +370,218 @@ win32.$(OBJEXT): {$(VPATH)}win32.c
###
-array.$(OBJEXT): {$(VPATH)}array.c {$(VPATH)}ruby.h config.h \
+array.$(OBJEXT): {$(VPATH)}array.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}util.h {$(VPATH)}st.h
ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h \
- {$(VPATH)}oniguruma.h config.h
-bignum.$(OBJEXT): {$(VPATH)}bignum.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}oniguruma.h {$(VPATH)}config.h
+bignum.$(OBJEXT): {$(VPATH)}bignum.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-class.$(OBJEXT): {$(VPATH)}class.c {$(VPATH)}ruby.h config.h \
+class.$(OBJEXT): {$(VPATH)}class.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubysig.h {$(VPATH)}node.h {$(VPATH)}st.h
-compar.$(OBJEXT): {$(VPATH)}compar.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}signal.h {$(VPATH)}node.h {$(VPATH)}st.h
+compar.$(OBJEXT): {$(VPATH)}compar.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-dir.$(OBJEXT): {$(VPATH)}dir.c {$(VPATH)}ruby.h config.h \
+dir.$(OBJEXT): {$(VPATH)}dir.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}util.h
-dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}ruby.h config.h \
+dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}dln.h
dmydln.$(OBJEXT): {$(VPATH)}dmydln.c {$(VPATH)}dln.c {$(VPATH)}ruby.h \
- config.h {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}dln.h
dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
-enum.$(OBJEXT): {$(VPATH)}enum.c {$(VPATH)}ruby.h config.h \
+enum.$(OBJEXT): {$(VPATH)}enum.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}util.h
-enumerator.$(OBJEXT): {$(VPATH)}enumerator.c {$(VPATH)}ruby.h config.h \
+enumerator.$(OBJEXT): {$(VPATH)}enumerator.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}ruby.h config.h \
+error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}st.h {$(VPATH)}vm_opts.h {$(VPATH)}rubysig.h \
+ {$(VPATH)}st.h {$(VPATH)}vm_opts.h {$(VPATH)}signal.h \
{$(VPATH)}yarvcore.h {$(VPATH)}node.h {$(VPATH)}debug.h \
{$(VPATH)}thread_$(THREAD_MODEL).h
euc_jp.$(OBJEXT): {$(VPATH)}euc_jp.c {$(VPATH)}regenc.h \
- {$(VPATH)}oniguruma.h config.h
+ {$(VPATH)}oniguruma.h {$(VPATH)}config.h
eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_error.h {$(VPATH)}eval_intern.h \
{$(VPATH)}eval_method.h {$(VPATH)}eval_safe.h {$(VPATH)}eval_jump.h \
- {$(VPATH)}ruby.h config.h {$(VPATH)}yarvcore.h \
+ {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}yarvcore.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}rubysig.h \
+ {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}signal.h \
{$(VPATH)}st.h {$(VPATH)}dln.h {$(VPATH)}debug.h \
{$(VPATH)}vm_opts.h {$(VPATH)}thread_$(THREAD_MODEL).h
eval_load.$(OBJEXT): {$(VPATH)}eval_load.c {$(VPATH)}eval_intern.h \
- {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}yarvcore.h \
- {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h {$(VPATH)}debug.h \
+ {$(VPATH)}signal.h {$(VPATH)}st.h {$(VPATH)}dln.h {$(VPATH)}debug.h \
{$(VPATH)}vm_opts.h {$(VPATH)}thread_$(THREAD_MODEL).h
-file.$(OBJEXT): {$(VPATH)}file.c {$(VPATH)}ruby.h config.h \
+file.$(OBJEXT): {$(VPATH)}file.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h {$(VPATH)}util.h \
+ {$(VPATH)}io.h {$(VPATH)}signal.h {$(VPATH)}util.h \
{$(VPATH)}dln.h
-gc.$(OBJEXT): {$(VPATH)}gc.c {$(VPATH)}ruby.h config.h \
+gc.$(OBJEXT): {$(VPATH)}gc.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}node.h \
+ {$(VPATH)}signal.h {$(VPATH)}st.h {$(VPATH)}node.h \
{$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}oniguruma.h \
{$(VPATH)}yarvcore.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \
{$(VPATH)}thread_$(THREAD_MODEL).h
-hash.$(OBJEXT): {$(VPATH)}hash.c {$(VPATH)}ruby.h config.h \
+hash.$(OBJEXT): {$(VPATH)}hash.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}rubysig.h
-inits.$(OBJEXT): {$(VPATH)}inits.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}signal.h
+inits.$(OBJEXT): {$(VPATH)}inits.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-io.$(OBJEXT): {$(VPATH)}io.c {$(VPATH)}ruby.h config.h \
+io.$(OBJEXT): {$(VPATH)}io.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h {$(VPATH)}util.h
-main.$(OBJEXT): {$(VPATH)}main.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}io.h {$(VPATH)}signal.h {$(VPATH)}util.h
+main.$(OBJEXT): {$(VPATH)}main.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-marshal.$(OBJEXT): {$(VPATH)}marshal.c {$(VPATH)}ruby.h config.h \
+marshal.$(OBJEXT): {$(VPATH)}marshal.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubyio.h {$(VPATH)}st.h {$(VPATH)}util.h
-math.$(OBJEXT): {$(VPATH)}math.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}io.h {$(VPATH)}st.h {$(VPATH)}util.h
+math.$(OBJEXT): {$(VPATH)}math.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-numeric.$(OBJEXT): {$(VPATH)}numeric.c {$(VPATH)}ruby.h config.h \
+numeric.$(OBJEXT): {$(VPATH)}numeric.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h \
{$(VPATH)}missing.h
-object.$(OBJEXT): {$(VPATH)}object.c {$(VPATH)}ruby.h config.h \
+object.$(OBJEXT): {$(VPATH)}object.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}debug.h
-pack.$(OBJEXT): {$(VPATH)}pack.c {$(VPATH)}ruby.h config.h \
+pack.$(OBJEXT): {$(VPATH)}pack.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-parse.$(OBJEXT): {$(VPATH)}parse.c {$(VPATH)}ruby.h config.h \
+parse.$(OBJEXT): {$(VPATH)}parse.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}oniguruma.h \
{$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c
-prec.$(OBJEXT): {$(VPATH)}prec.c {$(VPATH)}ruby.h config.h \
+prec.$(OBJEXT): {$(VPATH)}prec.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \
- {$(VPATH)}ruby.h config.h {$(VPATH)}yarvcore.h \
+ {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}yarvcore.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}gc.h \
- {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h \
+ {$(VPATH)}signal.h {$(VPATH)}st.h {$(VPATH)}dln.h \
{$(VPATH)}debug.h {$(VPATH)}vm_opts.h \
{$(VPATH)}thread_$(THREAD_MODEL).h
-process.$(OBJEXT): {$(VPATH)}process.c {$(VPATH)}ruby.h config.h \
+process.$(OBJEXT): {$(VPATH)}process.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}yarvcore.h
-random.$(OBJEXT): {$(VPATH)}random.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}signal.h {$(VPATH)}st.h {$(VPATH)}yarvcore.h
+random.$(OBJEXT): {$(VPATH)}random.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-range.$(OBJEXT): {$(VPATH)}range.c {$(VPATH)}ruby.h config.h \
+range.$(OBJEXT): {$(VPATH)}range.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-re.$(OBJEXT): {$(VPATH)}re.c {$(VPATH)}ruby.h config.h \
+re.$(OBJEXT): {$(VPATH)}re.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}oniguruma.h {$(VPATH)}re.h {$(VPATH)}regex.h \
- {$(VPATH)}regint.h {$(VPATH)}regenc.h {$(VPATH)}rubysig.h
-regcomp.$(OBJEXT): {$(VPATH)}regcomp.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}regint.h {$(VPATH)}regenc.h {$(VPATH)}signal.h
+regcomp.$(OBJEXT): {$(VPATH)}regcomp.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}oniguruma.h {$(VPATH)}regint.h {$(VPATH)}regparse.h \
- {$(VPATH)}regenc.h {$(VPATH)}rubysig.h
+ {$(VPATH)}regenc.h {$(VPATH)}signal.h
regenc.$(OBJEXT): {$(VPATH)}regenc.c {$(VPATH)}regint.h \
{$(VPATH)}regenc.h {$(VPATH)}oniguruma.h {$(VPATH)}ruby.h \
{$(VPATH)}defines.h {$(VPATH)}missing.h {$(VPATH)}intern.h \
- {$(VPATH)}rubysig.h
+ {$(VPATH)}signal.h
regerror.$(OBJEXT): {$(VPATH)}regerror.c {$(VPATH)}regint.h \
- {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h config.h \
+ {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h {$(VPATH)}config.h \
{$(VPATH)}ruby.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
- {$(VPATH)}intern.h {$(VPATH)}rubysig.h
+ {$(VPATH)}intern.h {$(VPATH)}signal.h
regexec.$(OBJEXT): {$(VPATH)}regexec.c {$(VPATH)}regint.h \
- {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h config.h \
+ {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h {$(VPATH)}config.h \
{$(VPATH)}ruby.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
- {$(VPATH)}intern.h {$(VPATH)}rubysig.h
+ {$(VPATH)}intern.h {$(VPATH)}signal.h
regparse.$(OBJEXT): {$(VPATH)}regparse.c {$(VPATH)}oniguruma.h \
- {$(VPATH)}regint.h {$(VPATH)}regparse.h {$(VPATH)}regenc.h config.h \
+ {$(VPATH)}regint.h {$(VPATH)}regparse.h {$(VPATH)}regenc.h {$(VPATH)}config.h \
{$(VPATH)}ruby.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
- {$(VPATH)}intern.h {$(VPATH)}rubysig.h
+ {$(VPATH)}intern.h {$(VPATH)}signal.h
regsyntax.$(OBJEXT): {$(VPATH)}regsyntax.c {$(VPATH)}oniguruma.h \
- {$(VPATH)}regint.h {$(VPATH)}regenc.h config.h \
+ {$(VPATH)}regint.h {$(VPATH)}regenc.h {$(VPATH)}config.h \
{$(VPATH)}ruby.h {$(VPATH)}defines.h {$(VPATH)}missing.h
-ruby.$(OBJEXT): {$(VPATH)}ruby.c {$(VPATH)}ruby.h config.h \
+ruby.$(OBJEXT): {$(VPATH)}ruby.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}dln.h {$(VPATH)}node.h {$(VPATH)}util.h
-signal.$(OBJEXT): {$(VPATH)}signal.c {$(VPATH)}ruby.h config.h \
+signal.$(OBJEXT): {$(VPATH)}signal.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubysig.h {$(VPATH)}yarvcore.h {$(VPATH)}node.h \
+ {$(VPATH)}signal.h {$(VPATH)}yarvcore.h {$(VPATH)}node.h \
{$(VPATH)}debug.h {$(VPATH)}vm_opts.h \
{$(VPATH)}thread_$(THREAD_MODEL).h
sjis.$(OBJEXT): {$(VPATH)}sjis.c {$(VPATH)}regenc.h \
- {$(VPATH)}oniguruma.h config.h
-sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}oniguruma.h {$(VPATH)}config.h
+sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}oniguruma.h \
{$(VPATH)}missing/vsnprintf.c
-st.$(OBJEXT): {$(VPATH)}st.c config.h {$(VPATH)}st.h {$(VPATH)}defines.h
-string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h config.h \
+st.$(OBJEXT): {$(VPATH)}st.c {$(VPATH)}config.h {$(VPATH)}st.h {$(VPATH)}defines.h
+string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}re.h {$(VPATH)}regex.h
-struct.$(OBJEXT): {$(VPATH)}struct.c {$(VPATH)}ruby.h config.h \
+struct.$(OBJEXT): {$(VPATH)}struct.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \
{$(VPATH)}thread_win32.h {$(VPATH)}thread_pthread.h \
{$(VPATH)}thread_win32.ci {$(VPATH)}thread_pthread.ci \
- {$(VPATH)}ruby.h {$(VPATH)}yarvcore.h config.h \
+ {$(VPATH)}ruby.h {$(VPATH)}yarvcore.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}util.h \
- {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h
+ {$(VPATH)}signal.h {$(VPATH)}st.h {$(VPATH)}dln.h
cont.$(OBJEXT): {$(VPATH)}cont.c {$(VPATH)}eval_intern.h \
- {$(VPATH)}ruby.h {$(VPATH)}yarvcore.h config.h \
+ {$(VPATH)}ruby.h {$(VPATH)}yarvcore.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}util.h \
- {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h
-time.$(OBJEXT): {$(VPATH)}time.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}signal.h {$(VPATH)}st.h {$(VPATH)}dln.h
+time.$(OBJEXT): {$(VPATH)}time.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
unicode.$(OBJEXT): {$(VPATH)}unicode.c {$(VPATH)}regenc.h \
- {$(VPATH)}oniguruma.h config.h
+ {$(VPATH)}oniguruma.h {$(VPATH)}config.h
utf8.$(OBJEXT): {$(VPATH)}utf8.c {$(VPATH)}regenc.h \
- {$(VPATH)}oniguruma.h config.h
-util.$(OBJEXT): {$(VPATH)}util.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}oniguruma.h {$(VPATH)}config.h
+util.$(OBJEXT): {$(VPATH)}util.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}util.h
-variable.$(OBJEXT): {$(VPATH)}variable.c {$(VPATH)}ruby.h config.h \
+variable.$(OBJEXT): {$(VPATH)}variable.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}util.h
-version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h config.h \
+version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}version.h
compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}yarvcore.h \
- {$(VPATH)}compile.h {$(VPATH)}debug.h {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}compile.h {$(VPATH)}debug.h {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}missing.h {$(VPATH)}intern.h \
- {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}rubysig.h \
+ {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}signal.h \
{$(VPATH)}insns.inc {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc \
{$(VPATH)}opt_sc.inc {$(VPATH)}optunifs.inc {$(VPATH)}vm_opts.h \
{$(VPATH)}thread_$(THREAD_MODEL).h
iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}yarvcore.h {$(VPATH)}debug.h \
{$(VPATH)}ruby.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
- {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}rubysig.h \
- {$(VPATH)}gc.h {$(VPATH)}vm_opts.h config.h {$(VPATH)}node.h \
+ {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}signal.h \
+ {$(VPATH)}gc.h {$(VPATH)}vm_opts.h {$(VPATH)}config.h {$(VPATH)}node.h \
{$(VPATH)}thread_$(THREAD_MODEL).h\
{$(VPATH)}insns.inc {$(VPATH)}insns_info.inc
vm.$(OBJEXT): {$(VPATH)}vm.c {$(VPATH)}vm.h {$(VPATH)}insnhelper.h \
- {$(VPATH)}yarvcore.h {$(VPATH)}debug.h {$(VPATH)}ruby.h config.h\
- {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}rubysig.h {$(VPATH)}dln.h \
+ {$(VPATH)}yarvcore.h {$(VPATH)}debug.h {$(VPATH)}ruby.h {$(VPATH)}config.h\
+ {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}signal.h {$(VPATH)}dln.h \
{$(VPATH)}vm_evalbody.ci {$(VPATH)}call_cfunc.ci \
{$(VPATH)}insns.inc {$(VPATH)}vm.inc {$(VPATH)}vmtc.inc \
{$(VPATH)}vm_macro.inc {$(VPATH)}vm_opts.h {$(VPATH)}eval_intern.h \
{$(VPATH)}defines.h {$(VPATH)}missing.h {$(VPATH)}intern.h \
{$(VPATH)}gc.h {$(VPATH)}thread_$(THREAD_MODEL).h
vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c {$(VPATH)}yarvcore.h {$(VPATH)}vm.h \
- {$(VPATH)}ruby.h config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
+ {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
{$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}debug.h \
- {$(VPATH)}rubysig.h {$(VPATH)}vm_opts.h {$(VPATH)}thread_$(THREAD_MODEL).h
+ {$(VPATH)}signal.h {$(VPATH)}vm_opts.h {$(VPATH)}thread_$(THREAD_MODEL).h
yarvcore.$(OBJEXT): {$(VPATH)}yarvcore.c {$(VPATH)}yarvcore.h \
- {$(VPATH)}debug.h {$(VPATH)}ruby.h config.h {$(VPATH)}defines.h \
+ {$(VPATH)}debug.h {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \
{$(VPATH)}missing.h {$(VPATH)}intern.h {$(VPATH)}st.h \
- {$(VPATH)}rubysig.h {$(VPATH)}node.h {$(VPATH)}gc.h {$(VPATH)}vm_opts.h \
+ {$(VPATH)}signal.h {$(VPATH)}node.h {$(VPATH)}gc.h {$(VPATH)}vm_opts.h \
{$(VPATH)}thread_$(THREAD_MODEL).h
debug.$(OBJEXT): {$(VPATH)}debug.h {$(VPATH)}ruby.h {$(VPATH)}defines.h \
- {$(VPATH)}missing.h {$(VPATH)}intern.h {$(VPATH)}st.h config.h \
+ {$(VPATH)}missing.h {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}config.h \
{$(VPATH)}st.h
blockinlining.$(OBJEXT): {$(VPATH)}blockinlining.c \
{$(VPATH)}ruby.h {$(VPATH)}defines.h \
- {$(VPATH)}missing.h {$(VPATH)}intern.h {$(VPATH)}st.h config.h \
- {$(VPATH)}node.h {$(VPATH)}yarvcore.h {$(VPATH)}rubysig.h \
+ {$(VPATH)}missing.h {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}config.h \
+ {$(VPATH)}node.h {$(VPATH)}yarvcore.h {$(VPATH)}signal.h \
{$(VPATH)}debug.h {$(VPATH)}vm_opts.h \
{$(VPATH)}thread_$(THREAD_MODEL).h
View
2 compar.c
@@ -10,7 +10,7 @@
**********************************************************************/
-#include "ruby.h"
+#include "ruby/ruby.h"
VALUE rb_mComparable;
View
4 compile.c
@@ -10,8 +10,8 @@
**********************************************************************/
-#include "ruby.h"
-#include "node.h"
+#include "ruby/ruby.h"
+#include "ruby/node.h"
#include "yarvcore.h"
#include "compile.h"
View
27 configure.in
@@ -216,10 +216,11 @@ AC_MINIX
AC_SUBST(RM, ['rm -f'])
AC_SUBST(CP, ['cp'])
if $as_mkdir_p; then
- AC_SUBST(MAKEDIRS, ['mkdir -p'])
+ MAKEDIRS='mkdir -p'
else
- AC_SUBST(MAKEDIRS, ['install -d'])
+ MAKEDIRS='install -d'
fi
+AC_SUBST(MAKEDIRS)
dnl check for large file stuff
AC_SYS_LARGEFILE
@@ -1271,7 +1272,7 @@ fi
AC_SUBST(MINIRUBY)
AC_SUBST(PREP)
AC_SUBST(RUNRUBY)
-AC_SUBST(EXTOUT, [${EXTOUT-.ext}])
+AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
FIRSTMAKEFILE=""
LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
@@ -1607,6 +1608,19 @@ if test "$search_path" != ""; then
AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path")
fi
+AC_ARG_WITH(rubyhdrdir,
+ [ --with-ruby-hdrdir=DIR core headers in DIR [INCLUDEDIR]],
+ [rubyhdrdir=$withval],
+ [rubyhdrdir='${includedir}/ruby-${MAJOR}.${MINOR}'])
+
+AC_ARG_WITH(sitehdrdir,
+ [ --with-site-hdrdir=DIR core headers in DIR [INCLUDEDIR]],
+ [sitehdrdir=$withval],
+ [sitehdrdir='${rubyhdrdir}/site_ruby'])
+
+AC_SUBST(rubyhdrdir)dnl
+AC_SUBST(sitehdrdir)dnl
+
AC_ARG_WITH(mantype,
[ --with-mantype=TYPE specify man page type; TYPE is one of man and doc],
[
@@ -1646,11 +1660,14 @@ AC_ARG_WITH(baseruby,
])
AC_SUBST(BASERUBY)
-if test -f config.h && tr -d '\015' < confdefs.h | cmp -s config.h -; then
+arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
+$MAKEDIRS "${arch_hdrdir}"
+config_h="${arch_hdrdir}/config.h"
+if test -f "${config_h}" && tr -d '\015' < confdefs.h | cmp -s "${config_h}" -; then
echo "config.h unchanged"
else
echo "creating config.h"
- tr -d '\015' < confdefs.h > config.h
+ tr -d '\015' < confdefs.h > "${config_h}"
fi
: > confdefs.h
View
2 cont.c
@@ -10,7 +10,7 @@
**********************************************************************/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include "yarvcore.h"
#include "gc.h"
#include "eval_intern.h"
View
2 cygwin/GNUmakefile.in
@@ -61,7 +61,7 @@ $(RUBY_EXP): $(LIBRUBY_A)
GNUmakefile: $(srcdir)/cygwin/GNUmakefile.in
ifeq (@target_os@,mingw32)
-$(OBJS) $(MAINOBJ): win32/win32.h
+$(OBJS) $(MAINOBJ): win32.h
$(LIBRUBY_SO): $(RUBYDEF)
View
2 debug.c
@@ -10,7 +10,7 @@
**********************************************************************/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include "debug.h"
void
View
4 debug.h
@@ -13,8 +13,8 @@
#ifndef _DEBUG_H_INCLUDED_
#define _DEBUG_H_INCLUDED_
-#include <ruby.h>
-#include <node.h>
+#include "ruby/ruby.h"
+#include "ruby/node.h"
#define dpv(h,v) ruby_debug_value(-1, 0, h, v)
#define dp(v) ruby_debug_value(-1, 0, "", v)
View
4 dir.c
@@ -12,7 +12,7 @@
**********************************************************************/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -61,7 +61,7 @@ char *strchr(char*,char);
#include <ctype.h>
-#include "util.h"
+#include "ruby/util.h"
#if !defined HAVE_LSTAT && !defined lstat
#define lstat stat
View
6 dln.c
@@ -10,7 +10,7 @@
**********************************************************************/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include "dln.h"
#ifdef HAVE_STDLIB_H
@@ -182,8 +182,8 @@ static int dln_init_p = 0;
#define INVALID_OBJECT(h) (N_MAGIC(h) != OMAGIC)
-#include "util.h"
-#include "st.h"
+#include "ruby/util.h"
+#include "ruby/st.h"
static st_table *sym_tbl;
static st_table *undef_tbl;
View
6 enum.c
@@ -10,9 +10,9 @@
**********************************************************************/
-#include "ruby.h"
-#include "node.h"
-#include "util.h"
+#include "ruby/ruby.h"
+#include "ruby/node.h"
+#include "ruby/util.h"
VALUE rb_mEnumerable;
static ID id_each, id_eqq, id_cmp;
View
2 enumerator.c
@@ -12,7 +12,7 @@
************************************************/
-#include "ruby.h"
+#include "ruby/ruby.h"
/*
* Document-class: Enumerable::Enumerator
View
4 error.c
@@ -10,8 +10,8 @@
**********************************************************************/
-#include "ruby.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/st.h"
#include "yarvcore.h"
#include <stdio.h>
View
10 eval_intern.h
@@ -6,10 +6,10 @@
(GET_THREAD()->passed_block = \
GC_GUARDED_PTR_REF((rb_block_t *)GET_THREAD()->cfp->lfp[0]))
-#include "ruby.h"
-#include "node.h"
-#include "util.h"
-#include "rubysig.h"
+#include "ruby/ruby.h"
+#include "ruby/node.h"
+#include "ruby/util.h"
+#include "ruby/signal.h"
#include "yarvcore.h"
#ifdef HAVE_STDLIB_H
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <setjmp.h>
-#include "st.h"
+#include "ruby/st.h"
#include "dln.h"
#ifdef __APPLE__
View
3 ext/bigdecimal/bigdecimal.c
@@ -13,7 +13,7 @@
*
*/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
@@ -22,7 +22,6 @@
#include <float.h>
#include <math.h>
#include "math.h"
-#include "version.h"
/* #define ENABLE_NUMERIC_STRING */
View
2 ext/digest/extconf.rb
@@ -4,7 +4,7 @@
require "mkmf"
$INSTALLFILES = {
- "digest.h" => "$(RUBYARCHDIR)"
+ "digest.h" => "$(HDRDIR)"
}
create_makefile("digest")
View
7 ext/dl/cptr.c
@@ -2,10 +2,9 @@
* $Id$
*/
-#include <ruby.h>
-#include <rubyio.h>
+#include <ruby/ruby.h>
+#include <ruby/io.h>
#include <ctype.h>
-#include <version.h> /* for ruby version code */
#include "dl.h"
VALUE rb_cDLCPtr;
@@ -421,7 +420,7 @@ rb_dlptr_s_to_ptr(VALUE self, VALUE val)
rb_io_t *fptr;
FILE *fp;
GetOpenFile(val, fptr);
-#if RUBY_VERSION_CODE >= 190
+#if HAVE_RB_IO_STDIO_FILE
fp = rb_io_stdio_file(fptr);
#else
fp = fptr->f;
View
5 ext/dl/dl.c
@@ -1,6 +1,5 @@
-#include <ruby.h>
-#include <rubyio.h>
-#include <version.h>
+#include <ruby/ruby.h>
+#include <ruby/io.h>
#include <ctype.h>
#include "dl.h"
View
4 ext/dl/extconf.rb
@@ -5,7 +5,7 @@
end
$INSTALLFILES = [
- ["dl.h", "$(archdir)$(target_prefix)", ""],
+ ["dl.h", "$(HDRDIR)"],
]
$distcleanfiles << "callback.h"
@@ -26,5 +26,7 @@
end
if( check )
+ have_func("rb_io_stdio_file", "ruby/ruby.h")
+ $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
create_makefile("dl")
end
View
24 ext/extmk.rb
@@ -112,10 +112,12 @@ def extmake(target)
Dir.chdir target
top_srcdir = $top_srcdir
topdir = $topdir
+ hdrdir = $hdrdir
mk_srcdir = CONFIG["srcdir"]
mk_topdir = CONFIG["topdir"]
prefix = "../" * (target.count("/")+1)
- $hdrdir = $top_srcdir = relative_from(top_srcdir, prefix)
+ $top_srcdir = relative_from(top_srcdir, prefix)
+ $hdrdir = relative_from(hdrdir, prefix)
$topdir = prefix + $topdir
$target = target
$mdir = target
@@ -130,8 +132,8 @@ def extmake(target)
RbConfig::CONFIG["hdrdir"] = $hdrdir
RbConfig::CONFIG["srcdir"] = $srcdir
RbConfig::CONFIG["topdir"] = $topdir
- CONFIG["hdrdir"] = ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1]
- CONFIG["srcdir"] = "$(hdrdir)/ext/#{$mdir}"
+ CONFIG["hdrdir"] = ($hdrdir == top_srcdir) ? top_srcdir : "$(top_srcdir)/include"
+ CONFIG["srcdir"] = "$(top_srcdir)/ext/#{$mdir}"
CONFIG["topdir"] = $topdir
begin
$extconf_h = nil
@@ -200,8 +202,9 @@ def extmake(target)
CONFIG["srcdir"] = mk_srcdir
CONFIG["topdir"] = mk_topdir
CONFIG.delete("hdrdir")
- $hdrdir = $top_srcdir = top_srcdir
+ $top_srcdir = top_srcdir
$topdir = topdir
+ $hdrdir = hdrdir
Dir.chdir dir
end
begin
@@ -284,6 +287,7 @@ def $mflags.defined?(var)
$continue = $mflags.set?(?k)
if $extout
$extout = '$(topdir)/'+$extout
+ RbConfig::CONFIG["extout"] = CONFIG["extout"] = $extout
$extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
$mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix"
end
@@ -322,10 +326,10 @@ def $mflags.defined?(var)
else
$ruby = '$(topdir)/miniruby' + EXEEXT
end
-$ruby << " -I'$(topdir)' -I'$(hdrdir)/lib'"
+$ruby << " -I'$(topdir)' -I'$(top_srcdir)/lib'"
$ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
-$ruby << " -I'$(hdrdir)/ext' -rpurelib.rb"
-$config_h = '$(topdir)/config.h'
+$ruby << " -I'$(top_srcdir)/ext' -rpurelib.rb"
+$config_h = '$(arch_hdrdir)/ruby/config.h'
ENV["RUBYLIB"] = "-"
ENV["RUBYOPT"] = "-rpurelib.rb"
@@ -404,12 +408,14 @@ def $mflags.defined?(var)
FileUtils::makedirs('ext')
Dir::chdir('ext')
-$hdrdir = $top_srcdir = relative_from(srcdir, $topdir = "..")
+hdrdir = $hdrdir
+$hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include"
exts.each do |d|
extmake(d) or abort
end
-$hdrdir = $top_srcdir = srcdir
+$top_srcdir = srcdir
$topdir = "."
+$hdrdir = hdrdir
extinit = Struct.new(:c, :o) {
def initialize(src)
View
6 ext/iconv/iconv.c
@@ -14,12 +14,12 @@
**********************************************************************/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include <errno.h>
#include <iconv.h>
#include <assert.h>
-#include "st.h"
-#include "intern.h"
+#include "ruby/st.h"
+#include "ruby/intern.h"
/*
* Document-class: Iconv
View
4 ext/json/ext/generator/generator.c
@@ -1,8 +1,8 @@
/* vim: set cin et sw=4 ts=4: */
#include <string.h>
-#include "ruby.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/st.h"
#include "unicode.h"
static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
View
8 ext/json/ext/parser/parser.c
@@ -1,9 +1,9 @@
#line 1 "parser.rl"
-/* vim: set cin et sw=4 ts=4: */
+/* -*-c-*- vim: set cin et sw=4 ts=4: */
-#include "ruby.h"
-#include "re.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/re.h"
+#include "ruby/st.h"
#include "unicode.h"
#define EVIL 0x666
View
8 ext/json/ext/parser/parser.rl
@@ -1,8 +1,8 @@
-/* vim: set cin et sw=4 ts=4: */
+/* -*-c-*- vim: set cin et sw=4 ts=4: */
-#include "ruby.h"
-#include "re.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/re.h"
+#include "ruby/st.h"
#include "unicode.h"
#define EVIL 0x666
View
2 ext/openssl/extconf.rb
@@ -19,6 +19,8 @@
dir_config("openssl")
dir_config("kerberos")
+$defs << "-DRUBY_VERSION_CODE=#{RUBY_VERSION.gsub(/\D/, '')}"
+
message "=== OpenSSL for Ruby configurator ===\n"
##
View
2 ext/probeprofiler/extconf.rb
@@ -1,2 +1,4 @@
require 'mkmf'
+$VPATH << "$(top_srcdir)"
+$INCFLAGS << " -I$(top_srcdir)"
create_makefile("probeprofiler")
View
2 ext/probeprofiler/probeprofiler.c
@@ -1,4 +1,4 @@
-#include <ruby.h>
+#include <ruby/ruby.h>
#include <yarvcore.h>
static void
View
16 ext/pty/pty.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "ruby/config.h"
#ifdef RUBY_EXTCONF_H
#include RUBY_EXTCONF_H
#endif
@@ -25,9 +25,9 @@
#endif
#include <ctype.h>
-#include "ruby.h"
-#include "rubyio.h"
-#include "util.h"
+#include "ruby/ruby.h"
+#include "ruby/io.h"
+#include "ruby/util.h"
#include <signal.h>
#ifdef HAVE_SYS_STROPTS_H
@@ -192,7 +192,7 @@ pty_exec(VALUE v)
static void
establishShell(int argc, VALUE *argv, struct pty_info *info)
{
- int i,master,slave;
+ int master,slave;
rb_pid_t pid;
char *p,*getenv();
struct passwd *pwent;
@@ -240,9 +240,9 @@ establishShell(int argc, VALUE *argv, struct pty_info *info)
# else /* SETGRP_VOID */
if (setpgrp(0, getpid()) == -1)
rb_sys_fail("setpgrp()");
- if ((i = open("/dev/tty", O_RDONLY)) < 0)
- rb_sys_fail("/dev/tty");
- else {
+ {
+ int i = open("/dev/tty", O_RDONLY);
+ if (i < 0) rb_sys_fail("/dev/tty");
if (ioctl(i, TIOCNOTTY, (char *)0))
perror("ioctl(TIOCNOTTY)");
close(i);
View
6 ext/racc/cparse/cparse.c
@@ -11,8 +11,7 @@
*/
-#include "ruby.h"
-#include "version.h"
+#include "ruby/ruby.h"
/* -----------------------------------------------------------------------
Important Constants
@@ -65,9 +64,6 @@ static ID id_d_e_pop;
#ifndef LONG2NUM
# define LONG2NUM(i) INT2NUM(i)
#endif
-#if RUBY_VERSION_CODE >= 190
-# define HAVE_RB_BLOCK_CALL 1
-#endif
static ID value_to_id _((VALUE v));
static inline long num_to_long _((VALUE n));
View
1 ext/racc/cparse/extconf.rb
@@ -1,4 +1,5 @@
# $Id$
require 'mkmf'
+have_func('rb_block_call', 'ruby/ruby.h')
create_makefile 'racc/cparse'
View
8 ext/readline/readline.c
@@ -5,7 +5,7 @@
#include RUBY_EXTCONF_H
#endif
-#include "config.h"
+#include "ruby/config.h"
#include <errno.h>
#include <stdio.h>
#include <ctype.h>
@@ -20,9 +20,9 @@
#include <editline/readline.h>
#endif
-#include "ruby.h"
-#include "rubyio.h"
-#include "rubysig.h"
+#include "ruby/ruby.h"
+#include "ruby/io.h"
+#include "ruby/signal.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
View
8 ext/ripper/depend
@@ -1,20 +1,20 @@
GEN = $(srcdir)/tools/generate.rb
-SRC1 = $(hdrdir)/parse.y
+SRC1 = $(top_srcdir)/parse.y
SRC2 = $(srcdir)/eventids2.c
BISON = bison
src: ripper.c eventids1.c eventids2table.c
-ripper.o: ripper.c $(topdir)/lex.c eventids1.c $(srcdir)/eventids2.c eventids2table.c
+ripper.o: ripper.c lex.c eventids1.c eventids2.c eventids2table.c
.y.c:
$(BISON) -t -v -o$@ $<
all: check
static: check
-ripper.y: $(srcdir)/tools/preproc.rb $(hdrdir)/parse.y
- $(RUBY) $(srcdir)/tools/preproc.rb $(hdrdir)/parse.y --output=$@
+ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y
+ $(RUBY) $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y --output=$@
check: $(GEN) $(SRC1) $(SRC2)
$(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2)
View
6 ext/ripper/extconf.rb
@@ -12,8 +12,10 @@ def main
end
$objs = %w(ripper.o)
$cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output eventids1.c eventids2table.c)
- $CPPFLAGS += ' -DRIPPER'
- $CPPFLAGS += ' -DRIPPER_DEBUG' if $debug
+ $defs << '-DRIPPER'
+ $defs << '-DRIPPER_DEBUG' if $debug
+ $VPATH << '$(topdir)' << '$(top_srcdir)'
+ $INCFLAGS << ' -I$(topdir) -I$(top_srcdir)'
create_makefile 'ripper'
end
View
2 ext/sdbm/_sdbm.c
@@ -12,7 +12,7 @@
#endif
#include "sdbm.h"
-#include "config.h"
+#include "ruby/config.h"
/*
* sdbm - ndbm work-alike hashed database library
View
8 ext/socket/depend
@@ -1,6 +1,8 @@
-socket.o: socket.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/rubyio.h $(hdrdir)/rubysig.h sockport.h constants.h
-getnameinfo.o: getnameinfo.c $(topdir)/config.h addrinfo.h sockport.h
-getaddrinfo.o: getaddrinfo.c $(topdir)/config.h addrinfo.h sockport.h
+socket.o: socket.c $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
+ $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/io.h $(hdrdir)/ruby/signal.h \
+ sockport.h constants.h
+getnameinfo.o: getnameinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h
+getaddrinfo.o: getaddrinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h
constants.h: $(srcdir)/mkconstants.rb
@echo "generating constants.h"
View
2 ext/socket/getaddrinfo.c
@@ -38,7 +38,7 @@
* - PF_UNSPEC case would be handled in getipnodebyname() with the AI_ALL flag.
*/
-#include "config.h"
+#include "ruby/config.h"
#include <sys/types.h>
#ifndef _WIN32
#include <sys/param.h>
View
2 ext/socket/getnameinfo.c
@@ -34,7 +34,7 @@
* but INRIA implementation returns EAI_xxx defined for getaddrinfo().
*/
-#include "config.h"
+#include "ruby/config.h"
#include <sys/types.h>
#ifndef _WIN32
#if defined(__BEOS__)
View
8 ext/socket/socket.c
@@ -10,10 +10,10 @@
************************************************/
-#include "ruby.h"
-#include "rubyio.h"
-#include "rubysig.h"
-#include "util.h"
+#include "ruby/ruby.h"
+#include "ruby/io.h"
+#include "ruby/signal.h"
+#include "ruby/util.h"
#include <stdio.h>
#include <sys/types.h>
View
4 ext/stringio/depend
@@ -1,2 +1,2 @@
-stringio.o: stringio.c $(hdrdir)/ruby.h $(topdir)/config.h \
- $(hdrdir)/defines.h $(hdrdir)/intern.h $(hdrdir)/rubyio.h
+stringio.o: stringio.c $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
+ $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/io.h
View
3 ext/strscan/depend
@@ -1,3 +1,2 @@
strscan.o: strscan.c $(hdrdir)/ruby.h $(hdrdir)/re.h $(hdrdir)/regex.h \
- $(hdrdir)/regint.h $(hdrdir)/oniguruma.h $(topdir)/config.h \
- $(hdrdir)/defines.h
+ $(hdrdir)/oniguruma.h $(topdir)/config.h $(hdrdir)/defines.h
View
4 ext/strscan/strscan.c
@@ -8,8 +8,8 @@
the Ruby License. For details, see the file COPYING.
*/
-#include "ruby.h"
-#include "re.h"
+#include "ruby/ruby.h"
+#include "ruby/re.h"
#define STRSCAN_VERSION "0.7.0"
View
2 ext/syck/bytecode.c
@@ -8,7 +8,7 @@
*
* Copyright (C) 2003 why the lucky stiff
*/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include "syck.h"
#include "gram.h"
View
2 ext/syck/emitter.c
@@ -9,7 +9,7 @@
* All Base64 code from Ruby's pack.c.
* Ruby is Copyright (C) 1993-2003 Yukihiro Matsumoto
*/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include <stdio.h>
#include <string.h>
View
2 ext/syck/handler.c
@@ -7,7 +7,7 @@
* Copyright (C) 2003 why the lucky stiff
*/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include "syck.h"
SYMID
View
2 ext/syck/implicit.c
@@ -9,7 +9,7 @@
* Copyright (C) 2003 why the lucky stiff
*/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include "syck.h"
#define YYCTYPE char
View
2 ext/syck/node.c
@@ -7,7 +7,7 @@
* Copyright (C) 2003 why the lucky stiff
*/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include "syck.h"
/*
View
2 ext/syck/rubyext.c
@@ -8,7 +8,7 @@
* Copyright (C) 2003-2005 why the lucky stiff
*/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include "syck.h"
#include <sys/types.h>
#include <time.h>
View
2 ext/syck/syck.c
@@ -6,7 +6,7 @@
*
* Copyright (C) 2003 why the lucky stiff
*/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include <stdio.h>
#include <string.h>
View
2 ext/syck/syck.h
@@ -18,7 +18,7 @@
#include <stdio.h>
#include <ctype.h>
-#include "st.h"
+#include "ruby/st.h"
#if defined(__cplusplus)
extern "C" {
View
2 ext/syck/token.c
@@ -8,7 +8,7 @@
*
* Copyright (C) 2003 why the lucky stiff
*/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include "syck.h"
#include "gram.h"
View
2 ext/syck/yaml2byte.c
@@ -9,7 +9,7 @@
* WARNING WARNING WARNING --- THIS IS *NOT JUST* PLAYING
* ANYMORE! -- WHY HAS EMBRACED THIS AS THE REAL THING!
*/
-#include "ruby.h"
+#include "ruby/ruby.h"
#include <syck.h>
#include <assert.h>
#define YAMLBYTE_UTF8
View
4 ext/syslog/syslog.c
@@ -7,8 +7,8 @@
* $Id$
*/
-#include "ruby.h"
-#include "util.h"
+#include "ruby/ruby.h"
+#include "ruby/util.h"
#include <syslog.h>
/* Syslog class */
View
2 ext/tk/extconf.rb
@@ -307,6 +307,8 @@ def pthread_check()
$INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
# create
+ $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
+ $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
create_makefile("tcltklib")
end
end
View
2 ext/tk/stubs.c
@@ -1,5 +1,5 @@
#include "stubs.h"
-#include "ruby.h"
+#include "ruby/ruby.h"
#include <tcl.h>
#include <tk.h>
View
5 ext/tk/tcltklib.c
@@ -6,9 +6,8 @@
#define TCLTKLIB_RELEASE_DATE "2006-12-01"
-#include "ruby.h"
-#include "rubysig.h"
-#include "version.h"
+#include "ruby/ruby.h"
+#include "ruby/signal.h"
#undef EXTERN /* avoid conflict with tcl.h of tcl8.2 or before */
#include <stdio.h>
#ifdef HAVE_STDARG_PROTOTYPES
View
1 ext/tk/tkutil/extconf.rb
@@ -7,5 +7,6 @@
if has_tk
require 'mkmf'
+ have_func("rb_obj_instance_exec", "ruby.h")
create_makefile('tkutil')
end
View
9 ext/tk/tkutil/tkutil.c
@@ -10,10 +10,9 @@
#define TKUTIL_RELEASE_DATE "2006-04-06"
-#include "ruby.h"
-#include "rubysig.h"
-#include "version.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/signal.h"
+#include "ruby/st.h"
static VALUE cMethod;
@@ -59,7 +58,7 @@ tk_s_new(argc, argv, klass)
VALUE obj = rb_class_new_instance(argc, argv, klass);
if (rb_block_given_p()) {
-#if RUBY_VERSION_MAJOR == 1 && RUBY_VERSION_MINOR <= 8 /* ruby 1.8.x */
+#ifndef HAVE_RB_OBJ_INSTANCE_EXEC
rb_obj_instance_eval(0, 0, obj);
#else
rb_obj_instance_exec(1, &obj, obj);
View
15 ext/win32ole/win32ole.c
@@ -16,8 +16,8 @@
modified for win32ole (ruby) by Masaki.Suketa <masaki.suketa@nifty.ne.jp>
*/
-#include "ruby.h"
-#include "st.h"
+#include "ruby/ruby.h"
+#include "ruby/st.h"
#include <ctype.h>
#include <windows.h>
#include <ocidl.h>
@@ -1076,8 +1076,8 @@ ole_set_safe_array(long n, SAFEARRAY *psa, long *pid, long *pub, VALUE val, long
val1 = ole_ary_m_entry(val, pid);
p = val2variant_ptr(val1, &var, vt);
if (is_all_index_under(pid, pub, dim) == Qtrue) {
- if (V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL ||
- V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL) {
+ if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) ||
+ (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) {
rb_raise(eWIN32OLERuntimeError, "argument does not have IDispatch or IUnknown Interface");
}
hr = SafeArrayPutElement(psa, pid, p);
@@ -2669,7 +2669,7 @@ fole_s_set_locale(VALUE self, VALUE vlcid)
cWIN32OLE_lcid = lcid;
break;
default:
- rb_raise(eWIN32OLERuntimeError, "not installed locale: %d", lcid);
+ rb_raise(eWIN32OLERuntimeError, "not installed locale: %u", (unsigned int)lcid);
}
}
return Qnil;
@@ -7827,7 +7827,6 @@ folevariant_ary_aset(int argc, VALUE *argv, VALUE self)
{
struct olevariantdata *pvar;
SAFEARRAY *psa;
- VALUE val = Qnil;
VARIANT var;
VARTYPE vt;
long *pid;
@@ -7849,8 +7848,8 @@ folevariant_ary_aset(int argc, VALUE *argv, VALUE self)
VariantInit(&var);
vt = (V_VT(&(pvar->var)) & ~VT_ARRAY);
p = val2variant_ptr(argv[argc-1], &var, vt);
- if (V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL ||
- V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL) {
+ if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) ||
+ (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) {
rb_raise(eWIN32OLERuntimeError, "argument does not have IDispatch or IUnknown Interface");
}
hr = SafeArrayPutElement(psa, pid, p);
View
8 file.c
@@ -16,10 +16,10 @@
#include "missing/file.h"
#endif
-#include "ruby.h"
-#include "rubyio.h"
-#include "rubysig.h"
-#include "util.h"
+#include "ruby/ruby.h"
+#include "ruby/io.h"
+#include "ruby/signal.h"
+#include "ruby/util.h"
#include "dln.h"
#ifdef HAVE_UNISTD_H
View
10 gc.c
@@ -12,11 +12,11 @@
**********************************************************************/
-#include "ruby.h"
-#include "rubysig.h"
-#include "st.h"
-#include "node.h"
-#include "re.h"
+#include "ruby/ruby.h"
+#include "ruby/signal.h"
+#include "ruby/st.h"
+#include "ruby/node.h"
+#include "ruby/re.h"
#include "yarvcore.h"
#include "gc.h"
#include <stdio.h>
View
8 hash.c
@@ -12,10 +12,10 @@
**********************************************************************/
-#include "ruby.h"
-#include "st.h"
-#include "util.h"
-#include "rubysig.h"
+#include "ruby/ruby.h"
+#include "ruby/st.h"
+#include "ruby/util.h"
+#include "ruby/signal.h"
#ifdef __APPLE__
#include <crt_externs.h>
View
1 include/ruby.h
@@ -0,0 +1 @@
+#include <ruby/ruby.h>
View
21 defines.h → include/ruby/defines.h
@@ -7,8 +7,16 @@
created at: Wed May 18 00:21:44 JST 1994
************************************************/
-#ifndef DEFINES_H
-#define DEFINES_H
+
+#ifndef RUBY_DEFINES_H
+#define RUBY_DEFINES_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
#define RUBY
@@ -185,7 +193,7 @@ void xfree(void*);
#endif /* NeXT */
#ifdef _WIN32
-#include "win32/win32.h"
+#include "ruby/win32.h"
#endif
#if defined(__VMS)
@@ -266,4 +274,11 @@ void rb_ia64_flushrs(void);
#define RUBY_PLATFORM "unknown-unknown"
#endif
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+} /* extern "C" { */
#endif
+
+#endif /* RUBY_DEFINES_H */
View
16 intern.h → include/ruby/intern.h
@@ -15,12 +15,19 @@
#ifndef RUBY_INTERN_H
#define RUBY_INTERN_H 1
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
#ifdef HAVE_STDARG_PROTOTYPES
# include <stdarg.h>
#else
# include <varargs.h>
#endif
-#include <st.h>
+#include <ruby/st.h>
/*
* Functions and variables that are used by more than one source file of
@@ -610,4 +617,11 @@ void Init_stack(VALUE*);
void rb_frame_pop(void);
NORETURN(void rb_thread_start_1(void));
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+} /* extern "C" { */
+#endif
+
#endif /* RUBY_INTERN_H */
View
19 rubyio.h → include/ruby/io.h
@@ -10,8 +10,15 @@
**********************************************************************/
-#ifndef RUBYIO_H
-#define RUBYIO_H
+#ifndef RUBY_IO_H
+#define RUBY_IO_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
#include <stdio.h>
#include <errno.h>
@@ -108,4 +115,12 @@ DEPRECATED(int rb_getc(FILE*));
DEPRECATED(long rb_io_fread(char *, long, FILE *));
DEPRECATED(long rb_io_fwrite(const char *, long, FILE *));
DEPRECATED(int rb_read_pending(FILE*));
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+} /* extern "C" { */
#endif
+
+#endif /* RUBY_IO_H */
View
20 missing.h → include/ruby/missing.h
@@ -9,8 +9,15 @@
************************************************/
-#ifndef MISSING_H
-#define MISSING_H
+#ifndef RUBY_MISSING_H
+#define RUBY_MISSING_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
#if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
@@ -145,4 +152,11 @@ extern size_t strlcpy(char *, const char*, size_t);
extern size_t strlcat(char *, const char*, size_t);
#endif
-#endif /* MISSING_H */
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+} /* extern "C" { */
+#endif
+
+#endif /* RUBY_MISSING_H */
View
12 node.h → include/ruby/node.h
@@ -10,11 +10,14 @@
**********************************************************************/
-#ifndef NODE_H
-#define NODE_H
+#ifndef RUBY_NODE_H
+#define RUBY_NODE_H 1
#if defined(__cplusplus)
extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
#endif
enum node_type {
@@ -388,7 +391,10 @@ VALUE rb_gvar_set(struct global_entry *, VALUE);
VALUE rb_gvar_defined(struct global_entry *);
#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
} /* extern "C" { */
#endif
-#endif
+#endif /* RUBY_NODE_H */
View
6 oniguruma.h → include/ruby/oniguruma.h
@@ -31,6 +31,9 @@
#ifdef __cplusplus
extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
#endif
#define ONIGURUMA
@@ -804,6 +807,9 @@ ONIG_EXTERN
const char* onig_copyright P_((void));
#ifdef __cplusplus
+#if 0
+{ /* satisfy cc-mode */
+#endif
}
#endif
View
21 re.h → include/ruby/re.h
@@ -10,13 +10,20 @@
**********************************************************************/
-#ifndef RE_H
-#define RE_H
+#ifndef RUBY_RE_H
+#define RUBY_RE_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
#include <sys/types.h>
#include <stdio.h>
-#include "regex.h"
+#include "ruby/regex.h"
typedef struct re_pattern_buffer Regexp;
@@ -40,4 +47,12 @@ RUBY_EXTERN int ruby_ignorecase;
int rb_reg_mbclen2(unsigned int, VALUE);
#define mbclen2(c,re) rb_reg_mbclen2((c),(re))
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+} /* extern "C" { */
#endif
+
+#endif /* RUBY_RE_H */
View
26