1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* include/ruby: moved public headers.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-06-10 03:06:15 +00:00
parent 1b8a677b23
commit 2b592580bf
124 changed files with 646 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> Sun Jun 10 10:42:04 2007 Tanaka Akira <akr@fsij.org>
* lib/securerandom.rb: renamed from lib/secrand.rb. * lib/securerandom.rb: renamed from lib/secrand.rb.

6
Makefile.in
View File

@ -4,7 +4,7 @@ NULLCMD = :
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = $(srcdir):$(srcdir)/missing hdrdir = $(srcdir)/include
CC = @CC@ CC = @CC@
YACC = bison YACC = bison
@ -32,11 +32,13 @@ RDOCTARGET = @RDOCTARGET@
EXTOUT = @EXTOUT@ EXTOUT = @EXTOUT@
RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
arch_hdrdir = $(EXTOUT)/include/$(arch)
VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing
empty = empty =
OUTFLAG = @OUTFLAG@$(empty) OUTFLAG = @OUTFLAG@$(empty)
CFLAGS = @CFLAGS@ @ARCH_FLAG@ CFLAGS = @CFLAGS@ @ARCH_FLAG@
XCFLAGS = -I. -I$(srcdir) @XCFLAGS@ XCFLAGS = -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
EXTLDFLAGS = EXTLDFLAGS =

6
array.c
View File

@ -12,9 +12,9 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "util.h" #include "ruby/util.h"
#include "st.h" #include "ruby/st.h"
VALUE rb_cArray; VALUE rb_cArray;

2
bignum.c
View File

@ -10,7 +10,7 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include <math.h> #include <math.h>
#include <float.h> #include <float.h>

4
blockinlining.c
View File

@ -9,8 +9,8 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "node.h" #include "ruby/node.h"
#include "yarvcore.h" #include "yarvcore.h"
VALUE yarv_new_iseqval(VALUE node, VALUE name, VALUE file, VALUE yarv_new_iseqval(VALUE node, VALUE name, VALUE file,

8
class.c
View File

@ -10,10 +10,10 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "rubysig.h" #include "ruby/signal.h"
#include "node.h" #include "ruby/node.h"
#include "st.h" #include "ruby/st.h"
#include <ctype.h> #include <ctype.h>
extern st_table *rb_class_tbl; extern st_table *rb_class_tbl;

170
common.mk
View File

@ -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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}util.h {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}st.h
ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h \ ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h \
{$(VPATH)}oniguruma.h config.h {$(VPATH)}oniguruma.h {$(VPATH)}config.h
bignum.$(OBJEXT): {$(VPATH)}bignum.c {$(VPATH)}ruby.h config.h \ bignum.$(OBJEXT): {$(VPATH)}bignum.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}rubysig.h {$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}signal.h {$(VPATH)}node.h {$(VPATH)}st.h
compar.$(OBJEXT): {$(VPATH)}compar.c {$(VPATH)}ruby.h config.h \ compar.$(OBJEXT): {$(VPATH)}compar.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}util.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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}dln.h {$(VPATH)}dln.h
dmydln.$(OBJEXT): {$(VPATH)}dmydln.c {$(VPATH)}dln.c {$(VPATH)}ruby.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 {$(VPATH)}dln.h
dmyext.$(OBJEXT): {$(VPATH)}dmyext.c 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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}util.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 {$(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)}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)}yarvcore.h {$(VPATH)}node.h {$(VPATH)}debug.h \
{$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}thread_$(THREAD_MODEL).h
euc_jp.$(OBJEXT): {$(VPATH)}euc_jp.c {$(VPATH)}regenc.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 \ 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)}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)}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)}st.h {$(VPATH)}dln.h {$(VPATH)}debug.h \
{$(VPATH)}vm_opts.h {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}vm_opts.h {$(VPATH)}thread_$(THREAD_MODEL).h
eval_load.$(OBJEXT): {$(VPATH)}eval_load.c {$(VPATH)}eval_intern.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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}yarvcore.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 {$(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)}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 {$(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)}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)}re.h {$(VPATH)}regex.h {$(VPATH)}oniguruma.h \
{$(VPATH)}yarvcore.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \ {$(VPATH)}yarvcore.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \
{$(VPATH)}thread_$(THREAD_MODEL).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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}signal.h
inits.$(OBJEXT): {$(VPATH)}inits.c {$(VPATH)}ruby.h config.h \ inits.$(OBJEXT): {$(VPATH)}inits.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.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)}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
main.$(OBJEXT): {$(VPATH)}main.c {$(VPATH)}ruby.h config.h \ main.$(OBJEXT): {$(VPATH)}main.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}rubyio.h {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}io.h {$(VPATH)}st.h {$(VPATH)}util.h
math.$(OBJEXT): {$(VPATH)}math.c {$(VPATH)}ruby.h config.h \ math.$(OBJEXT): {$(VPATH)}math.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.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)}defines.h {$(VPATH)}intern.h \
{$(VPATH)}missing.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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}debug.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 {$(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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}oniguruma.h \ {$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}oniguruma.h \
{$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c {$(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 {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}gc.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)}debug.h {$(VPATH)}vm_opts.h \
{$(VPATH)}thread_$(THREAD_MODEL).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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}yarvcore.h {$(VPATH)}signal.h {$(VPATH)}st.h {$(VPATH)}yarvcore.h
random.$(OBJEXT): {$(VPATH)}random.c {$(VPATH)}ruby.h config.h \ random.$(OBJEXT): {$(VPATH)}random.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.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 {$(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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}oniguruma.h {$(VPATH)}re.h {$(VPATH)}regex.h \ {$(VPATH)}oniguruma.h {$(VPATH)}re.h {$(VPATH)}regex.h \
{$(VPATH)}regint.h {$(VPATH)}regenc.h {$(VPATH)}rubysig.h {$(VPATH)}regint.h {$(VPATH)}regenc.h {$(VPATH)}signal.h
regcomp.$(OBJEXT): {$(VPATH)}regcomp.c {$(VPATH)}ruby.h config.h \ regcomp.$(OBJEXT): {$(VPATH)}regcomp.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}oniguruma.h {$(VPATH)}regint.h {$(VPATH)}regparse.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 \ regenc.$(OBJEXT): {$(VPATH)}regenc.c {$(VPATH)}regint.h \
{$(VPATH)}regenc.h {$(VPATH)}oniguruma.h {$(VPATH)}ruby.h \ {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h {$(VPATH)}ruby.h \
{$(VPATH)}defines.h {$(VPATH)}missing.h {$(VPATH)}intern.h \ {$(VPATH)}defines.h {$(VPATH)}missing.h {$(VPATH)}intern.h \
{$(VPATH)}rubysig.h {$(VPATH)}signal.h
regerror.$(OBJEXT): {$(VPATH)}regerror.c {$(VPATH)}regint.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)}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 \ 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)}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 \ 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)}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 \ 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 {$(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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}dln.h {$(VPATH)}node.h {$(VPATH)}util.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)}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)}debug.h {$(VPATH)}vm_opts.h \
{$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}thread_$(THREAD_MODEL).h
sjis.$(OBJEXT): {$(VPATH)}sjis.c {$(VPATH)}regenc.h \ sjis.$(OBJEXT): {$(VPATH)}sjis.c {$(VPATH)}regenc.h \
{$(VPATH)}oniguruma.h config.h {$(VPATH)}oniguruma.h {$(VPATH)}config.h
sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h config.h \ sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}oniguruma.h \ {$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}oniguruma.h \
{$(VPATH)}missing/vsnprintf.c {$(VPATH)}missing/vsnprintf.c
st.$(OBJEXT): {$(VPATH)}st.c config.h {$(VPATH)}st.h {$(VPATH)}defines.h st.$(OBJEXT): {$(VPATH)}st.c {$(VPATH)}config.h {$(VPATH)}st.h {$(VPATH)}defines.h
string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h config.h \ string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}re.h {$(VPATH)}regex.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 {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \ thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \
{$(VPATH)}thread_win32.h {$(VPATH)}thread_pthread.h \ {$(VPATH)}thread_win32.h {$(VPATH)}thread_pthread.h \
{$(VPATH)}thread_win32.ci {$(VPATH)}thread_pthread.ci \ {$(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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}util.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 \ 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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}util.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
time.$(OBJEXT): {$(VPATH)}time.c {$(VPATH)}ruby.h config.h \ time.$(OBJEXT): {$(VPATH)}time.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
unicode.$(OBJEXT): {$(VPATH)}unicode.c {$(VPATH)}regenc.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 \ utf8.$(OBJEXT): {$(VPATH)}utf8.c {$(VPATH)}regenc.h \
{$(VPATH)}oniguruma.h config.h {$(VPATH)}oniguruma.h {$(VPATH)}config.h
util.$(OBJEXT): {$(VPATH)}util.c {$(VPATH)}ruby.h config.h \ util.$(OBJEXT): {$(VPATH)}util.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}util.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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}util.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)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}version.h {$(VPATH)}version.h
compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}yarvcore.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)}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)}insns.inc {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc \
{$(VPATH)}opt_sc.inc {$(VPATH)}optunifs.inc {$(VPATH)}vm_opts.h \ {$(VPATH)}opt_sc.inc {$(VPATH)}optunifs.inc {$(VPATH)}vm_opts.h \
{$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}thread_$(THREAD_MODEL).h
iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}yarvcore.h {$(VPATH)}debug.h \ iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}yarvcore.h {$(VPATH)}debug.h \
{$(VPATH)}ruby.h {$(VPATH)}defines.h {$(VPATH)}missing.h \ {$(VPATH)}ruby.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
{$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}rubysig.h \ {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}signal.h \
{$(VPATH)}gc.h {$(VPATH)}vm_opts.h config.h {$(VPATH)}node.h \ {$(VPATH)}gc.h {$(VPATH)}vm_opts.h {$(VPATH)}config.h {$(VPATH)}node.h \
{$(VPATH)}thread_$(THREAD_MODEL).h\ {$(VPATH)}thread_$(THREAD_MODEL).h\
{$(VPATH)}insns.inc {$(VPATH)}insns_info.inc {$(VPATH)}insns.inc {$(VPATH)}insns_info.inc
vm.$(OBJEXT): {$(VPATH)}vm.c {$(VPATH)}vm.h {$(VPATH)}insnhelper.h \ vm.$(OBJEXT): {$(VPATH)}vm.c {$(VPATH)}vm.h {$(VPATH)}insnhelper.h \
{$(VPATH)}yarvcore.h {$(VPATH)}debug.h {$(VPATH)}ruby.h config.h\ {$(VPATH)}yarvcore.h {$(VPATH)}debug.h {$(VPATH)}ruby.h {$(VPATH)}config.h\
{$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}rubysig.h {$(VPATH)}dln.h \ {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}signal.h {$(VPATH)}dln.h \
{$(VPATH)}vm_evalbody.ci {$(VPATH)}call_cfunc.ci \ {$(VPATH)}vm_evalbody.ci {$(VPATH)}call_cfunc.ci \
{$(VPATH)}insns.inc {$(VPATH)}vm.inc {$(VPATH)}vmtc.inc \ {$(VPATH)}insns.inc {$(VPATH)}vm.inc {$(VPATH)}vmtc.inc \
{$(VPATH)}vm_macro.inc {$(VPATH)}vm_opts.h {$(VPATH)}eval_intern.h \ {$(VPATH)}vm_macro.inc {$(VPATH)}vm_opts.h {$(VPATH)}eval_intern.h \
{$(VPATH)}defines.h {$(VPATH)}missing.h {$(VPATH)}intern.h \ {$(VPATH)}defines.h {$(VPATH)}missing.h {$(VPATH)}intern.h \
{$(VPATH)}gc.h {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}gc.h {$(VPATH)}thread_$(THREAD_MODEL).h
vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c {$(VPATH)}yarvcore.h {$(VPATH)}vm.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)}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 \ 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)}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 {$(VPATH)}thread_$(THREAD_MODEL).h
debug.$(OBJEXT): {$(VPATH)}debug.h {$(VPATH)}ruby.h {$(VPATH)}defines.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 {$(VPATH)}st.h
blockinlining.$(OBJEXT): {$(VPATH)}blockinlining.c \ blockinlining.$(OBJEXT): {$(VPATH)}blockinlining.c \
{$(VPATH)}ruby.h {$(VPATH)}defines.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)}node.h {$(VPATH)}yarvcore.h {$(VPATH)}rubysig.h \ {$(VPATH)}node.h {$(VPATH)}yarvcore.h {$(VPATH)}signal.h \
{$(VPATH)}debug.h {$(VPATH)}vm_opts.h \ {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \
{$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}thread_$(THREAD_MODEL).h

2
compar.c
View File

@ -10,7 +10,7 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
VALUE rb_mComparable; VALUE rb_mComparable;

4
compile.c
View File

@ -10,8 +10,8 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "node.h" #include "ruby/node.h"
#include "yarvcore.h" #include "yarvcore.h"
#include "compile.h" #include "compile.h"

27
configure.in
View File

@ -216,10 +216,11 @@ AC_MINIX
AC_SUBST(RM, ['rm -f']) AC_SUBST(RM, ['rm -f'])
AC_SUBST(CP, ['cp']) AC_SUBST(CP, ['cp'])
if $as_mkdir_p; then if $as_mkdir_p; then
AC_SUBST(MAKEDIRS, ['mkdir -p']) MAKEDIRS='mkdir -p'
else else
AC_SUBST(MAKEDIRS, ['install -d']) MAKEDIRS='install -d'
fi fi
AC_SUBST(MAKEDIRS)
dnl check for large file stuff dnl check for large file stuff
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
@ -1271,7 +1272,7 @@ fi
AC_SUBST(MINIRUBY) AC_SUBST(MINIRUBY)
AC_SUBST(PREP) AC_SUBST(PREP)
AC_SUBST(RUNRUBY) AC_SUBST(RUNRUBY)
AC_SUBST(EXTOUT, [${EXTOUT-.ext}]) AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
FIRSTMAKEFILE="" FIRSTMAKEFILE=""
LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a' 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") AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path")
fi 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, AC_ARG_WITH(mantype,
[ --with-mantype=TYPE specify man page type; TYPE is one of man and doc], [ --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) 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" echo "config.h unchanged"
else else
echo "creating config.h" echo "creating config.h"
tr -d '\015' < confdefs.h > config.h tr -d '\015' < confdefs.h > "${config_h}"
fi fi
: > confdefs.h : > confdefs.h

2
cont.c
View File

@ -10,7 +10,7 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "yarvcore.h" #include "yarvcore.h"
#include "gc.h" #include "gc.h"
#include "eval_intern.h" #include "eval_intern.h"

2
cygwin/GNUmakefile.in
View File

@ -61,7 +61,7 @@ $(RUBY_EXP): $(LIBRUBY_A)
GNUmakefile: $(srcdir)/cygwin/GNUmakefile.in GNUmakefile: $(srcdir)/cygwin/GNUmakefile.in
ifeq (@target_os@,mingw32) ifeq (@target_os@,mingw32)
$(OBJS) $(MAINOBJ): win32/win32.h $(OBJS) $(MAINOBJ): win32.h
$(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO): $(RUBYDEF)

2
debug.c
View File

@ -10,7 +10,7 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "debug.h" #include "debug.h"
void void

4
debug.h
View File

@ -13,8 +13,8 @@
#ifndef _DEBUG_H_INCLUDED_ #ifndef _DEBUG_H_INCLUDED_
#define _DEBUG_H_INCLUDED_ #define _DEBUG_H_INCLUDED_
#include <ruby.h> #include "ruby/ruby.h"
#include <node.h> #include "ruby/node.h"
#define dpv(h,v) ruby_debug_value(-1, 0, h, v) #define dpv(h,v) ruby_debug_value(-1, 0, h, v)
#define dp(v) ruby_debug_value(-1, 0, "", v) #define dp(v) ruby_debug_value(-1, 0, "", v)

4
dir.c
View File

@ -12,7 +12,7 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -61,7 +61,7 @@ char *strchr(char*,char);
#include <ctype.h> #include <ctype.h>
#include "util.h" #include "ruby/util.h"
#if !defined HAVE_LSTAT && !defined lstat #if !defined HAVE_LSTAT && !defined lstat
#define lstat stat #define lstat stat

6
dln.c
View File

@ -10,7 +10,7 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "dln.h" #include "dln.h"
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
@ -182,8 +182,8 @@ static int dln_init_p = 0;
#define INVALID_OBJECT(h) (N_MAGIC(h) != OMAGIC) #define INVALID_OBJECT(h) (N_MAGIC(h) != OMAGIC)
#include "util.h" #include "ruby/util.h"
#include "st.h" #include "ruby/st.h"
static st_table *sym_tbl; static st_table *sym_tbl;
static st_table *undef_tbl; static st_table *undef_tbl;

6
enum.c
View File

@ -10,9 +10,9 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "node.h" #include "ruby/node.h"
#include "util.h" #include "ruby/util.h"
VALUE rb_mEnumerable; VALUE rb_mEnumerable;
static ID id_each, id_eqq, id_cmp; static ID id_each, id_eqq, id_cmp;

2
enumerator.c
View File

@ -12,7 +12,7 @@
************************************************/ ************************************************/
#include "ruby.h" #include "ruby/ruby.h"
/* /*
* Document-class: Enumerable::Enumerator * Document-class: Enumerable::Enumerator

4
error.c
View File

@ -10,8 +10,8 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "st.h" #include "ruby/st.h"
#include "yarvcore.h" #include "yarvcore.h"
#include <stdio.h> #include <stdio.h>

10
eval_intern.h
View File

@ -6,10 +6,10 @@
(GET_THREAD()->passed_block = \ (GET_THREAD()->passed_block = \
GC_GUARDED_PTR_REF((rb_block_t *)GET_THREAD()->cfp->lfp[0])) GC_GUARDED_PTR_REF((rb_block_t *)GET_THREAD()->cfp->lfp[0]))
#include "ruby.h" #include "ruby/ruby.h"
#include "node.h" #include "ruby/node.h"
#include "util.h" #include "ruby/util.h"
#include "rubysig.h" #include "ruby/signal.h"
#include "yarvcore.h" #include "yarvcore.h"
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
@ -25,7 +25,7 @@
#include <stdio.h> #include <stdio.h>
#include <setjmp.h> #include <setjmp.h>
#include "st.h" #include "ruby/st.h"
#include "dln.h" #include "dln.h"
#ifdef __APPLE__ #ifdef __APPLE__

3
ext/bigdecimal/bigdecimal.c
View File

@ -13,7 +13,7 @@
* *
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include <ctype.h> #include <ctype.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -22,7 +22,6 @@
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include "math.h" #include "math.h"
#include "version.h"
/* #define ENABLE_NUMERIC_STRING */ /* #define ENABLE_NUMERIC_STRING */

2
ext/digest/extconf.rb
View File

@ -4,7 +4,7 @@
require "mkmf" require "mkmf"
$INSTALLFILES = { $INSTALLFILES = {
"digest.h" => "$(RUBYARCHDIR)" "digest.h" => "$(HDRDIR)"
} }
create_makefile("digest") create_makefile("digest")

7
ext/dl/cptr.c
View File

@ -2,10 +2,9 @@
* $Id$ * $Id$
*/ */
#include <ruby.h> #include <ruby/ruby.h>
#include <rubyio.h> #include <ruby/io.h>
#include <ctype.h> #include <ctype.h>
#include <version.h> /* for ruby version code */
#include "dl.h" #include "dl.h"
VALUE rb_cDLCPtr; VALUE rb_cDLCPtr;
@ -421,7 +420,7 @@ rb_dlptr_s_to_ptr(VALUE self, VALUE val)
rb_io_t *fptr; rb_io_t *fptr;
FILE *fp; FILE *fp;
GetOpenFile(val, fptr); GetOpenFile(val, fptr);
#if RUBY_VERSION_CODE >= 190 #if HAVE_RB_IO_STDIO_FILE
fp = rb_io_stdio_file(fptr); fp = rb_io_stdio_file(fptr);
#else #else
fp = fptr->f; fp = fptr->f;

5
ext/dl/dl.c
View File

@ -1,6 +1,5 @@
#include <ruby.h> #include <ruby/ruby.h>
#include <rubyio.h> #include <ruby/io.h>
#include <version.h>
#include <ctype.h> #include <ctype.h>
#include "dl.h" #include "dl.h"

4
ext/dl/extconf.rb
View File

@ -5,7 +5,7 @@ if( RbConfig::CONFIG['CC'] =~ /gcc/ )
end end
$INSTALLFILES = [ $INSTALLFILES = [
["dl.h", "$(archdir)$(target_prefix)", ""], ["dl.h", "$(HDRDIR)"],
] ]
$distcleanfiles << "callback.h" $distcleanfiles << "callback.h"
@ -26,5 +26,7 @@ else
end end
if( check ) if( check )
have_func("rb_io_stdio_file", "ruby/ruby.h")
$defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
create_makefile("dl") create_makefile("dl")
end end

24
ext/extmk.rb
View File

@ -112,10 +112,12 @@ def extmake(target)
Dir.chdir target Dir.chdir target
top_srcdir = $top_srcdir top_srcdir = $top_srcdir
topdir = $topdir topdir = $topdir
hdrdir = $hdrdir
mk_srcdir = CONFIG["srcdir"] mk_srcdir = CONFIG["srcdir"]
mk_topdir = CONFIG["topdir"] mk_topdir = CONFIG["topdir"]
prefix = "../" * (target.count("/")+1) 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 $topdir = prefix + $topdir
$target = target $target = target
$mdir = target $mdir = target
@ -130,8 +132,8 @@ def extmake(target)
RbConfig::CONFIG["hdrdir"] = $hdrdir RbConfig::CONFIG["hdrdir"] = $hdrdir
RbConfig::CONFIG["srcdir"] = $srcdir RbConfig::CONFIG["srcdir"] = $srcdir
RbConfig::CONFIG["topdir"] = $topdir RbConfig::CONFIG["topdir"] = $topdir
CONFIG["hdrdir"] = ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1] CONFIG["hdrdir"] = ($hdrdir == top_srcdir) ? top_srcdir : "$(top_srcdir)/include"
CONFIG["srcdir"] = "$(hdrdir)/ext/#{$mdir}" CONFIG["srcdir"] = "$(top_srcdir)/ext/#{$mdir}"
CONFIG["topdir"] = $topdir CONFIG["topdir"] = $topdir
begin begin
$extconf_h = nil $extconf_h = nil
@ -200,8 +202,9 @@ def extmake(target)
CONFIG["srcdir"] = mk_srcdir CONFIG["srcdir"] = mk_srcdir
CONFIG["topdir"] = mk_topdir CONFIG["topdir"] = mk_topdir
CONFIG.delete("hdrdir") CONFIG.delete("hdrdir")
$hdrdir = $top_srcdir = top_srcdir $top_srcdir = top_srcdir
$topdir = topdir $topdir = topdir
$hdrdir = hdrdir
Dir.chdir dir Dir.chdir dir
end end
begin begin
@ -284,6 +287,7 @@ def parse_args()
$continue = $mflags.set?(?k) $continue = $mflags.set?(?k)
if $extout if $extout
$extout = '$(topdir)/'+$extout $extout = '$(topdir)/'+$extout
RbConfig::CONFIG["extout"] = CONFIG["extout"] = $extout
$extout_prefix = $extout ? "$(extout)$(target_prefix)/" : "" $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
$mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix" $mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix"
end end
@ -322,10 +326,10 @@ elsif sep = config_string('BUILD_FILE_SEPARATOR')
else else
$ruby = '$(topdir)/miniruby' + EXEEXT $ruby = '$(topdir)/miniruby' + EXEEXT
end 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'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
$ruby << " -I'$(hdrdir)/ext' -rpurelib.rb" $ruby << " -I'$(top_srcdir)/ext' -rpurelib.rb"
$config_h = '$(topdir)/config.h' $config_h = '$(arch_hdrdir)/ruby/config.h'
ENV["RUBYLIB"] = "-" ENV["RUBYLIB"] = "-"
ENV["RUBYOPT"] = "-rpurelib.rb" ENV["RUBYOPT"] = "-rpurelib.rb"
@ -404,12 +408,14 @@ dir = Dir.pwd
FileUtils::makedirs('ext') FileUtils::makedirs('ext')
Dir::chdir('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| exts.each do |d|
extmake(d) or abort extmake(d) or abort
end end
$hdrdir = $top_srcdir = srcdir $top_srcdir = srcdir
$topdir = "." $topdir = "."
$hdrdir = hdrdir
extinit = Struct.new(:c, :o) { extinit = Struct.new(:c, :o) {
def initialize(src) def initialize(src)

6
ext/iconv/iconv.c
View File

@ -14,12 +14,12 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include <errno.h> #include <errno.h>
#include <iconv.h> #include <iconv.h>
#include <assert.h> #include <assert.h>
#include "st.h" #include "ruby/st.h"
#include "intern.h" #include "ruby/intern.h"
/* /*
* Document-class: Iconv * Document-class: Iconv

4
ext/json/ext/generator/generator.c
View File

@ -1,8 +1,8 @@
/* vim: set cin et sw=4 ts=4: */ /* vim: set cin et sw=4 ts=4: */
#include <string.h> #include <string.h>
#include "ruby.h" #include "ruby/ruby.h"
#include "st.h" #include "ruby/st.h"
#include "unicode.h" #include "unicode.h"
static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject, static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,

8
ext/json/ext/parser/parser.c
View File

@ -1,9 +1,9 @@
#line 1 "parser.rl" #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 "ruby/ruby.h"
#include "re.h" #include "ruby/re.h"
#include "st.h" #include "ruby/st.h"
#include "unicode.h" #include "unicode.h"
#define EVIL 0x666 #define EVIL 0x666

8
ext/json/ext/parser/parser.rl
View File

@ -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 "ruby/ruby.h"
#include "re.h" #include "ruby/re.h"
#include "st.h" #include "ruby/st.h"
#include "unicode.h" #include "unicode.h"
#define EVIL 0x666 #define EVIL 0x666

2
ext/openssl/extconf.rb
View File

@ -19,6 +19,8 @@ require "mkmf"
dir_config("openssl") dir_config("openssl")
dir_config("kerberos") dir_config("kerberos")
$defs << "-DRUBY_VERSION_CODE=#{RUBY_VERSION.gsub(/\D/, '')}"
message "=== OpenSSL for Ruby configurator ===\n" message "=== OpenSSL for Ruby configurator ===\n"
## ##

2
ext/probeprofiler/extconf.rb
View File

@ -1,2 +1,4 @@
require 'mkmf' require 'mkmf'
$VPATH << "$(top_srcdir)"
$INCFLAGS << " -I$(top_srcdir)"
create_makefile("probeprofiler") create_makefile("probeprofiler")

2
ext/probeprofiler/probeprofiler.c
View File

@ -1,4 +1,4 @@
#include <ruby.h> #include <ruby/ruby.h>
#include <yarvcore.h> #include <yarvcore.h>
static void static void

16
ext/pty/pty.c
View File

@ -1,4 +1,4 @@
#include "config.h" #include "ruby/config.h"
#ifdef RUBY_EXTCONF_H #ifdef RUBY_EXTCONF_H
#include RUBY_EXTCONF_H #include RUBY_EXTCONF_H
#endif #endif
@ -25,9 +25,9 @@
#endif #endif
#include <ctype.h> #include <ctype.h>
#include "ruby.h" #include "ruby/ruby.h"
#include "rubyio.h" #include "ruby/io.h"
#include "util.h" #include "ruby/util.h"
#include <signal.h> #include <signal.h>
#ifdef HAVE_SYS_STROPTS_H #ifdef HAVE_SYS_STROPTS_H
@ -192,7 +192,7 @@ pty_exec(VALUE v)
static void static void
establishShell(int argc, VALUE *argv, struct pty_info *info) establishShell(int argc, VALUE *argv, struct pty_info *info)
{ {
int i,master,slave; int master,slave;
rb_pid_t pid; rb_pid_t pid;
char *p,*getenv(); char *p,*getenv();
struct passwd *pwent; struct passwd *pwent;
@ -240,9 +240,9 @@ establishShell(int argc, VALUE *argv, struct pty_info *info)
# else /* SETGRP_VOID */ # else /* SETGRP_VOID */
if (setpgrp(0, getpid()) == -1) if (setpgrp(0, getpid()) == -1)
rb_sys_fail("setpgrp()"); rb_sys_fail("setpgrp()");
if ((i = open("/dev/tty", O_RDONLY)) < 0) {
rb_sys_fail("/dev/tty"); int i = open("/dev/tty", O_RDONLY);
else { if (i < 0) rb_sys_fail("/dev/tty");
if (ioctl(i, TIOCNOTTY, (char *)0)) if (ioctl(i, TIOCNOTTY, (char *)0))
perror("ioctl(TIOCNOTTY)"); perror("ioctl(TIOCNOTTY)");
close(i); close(i);

6
ext/racc/cparse/cparse.c
View File

@ -11,8 +11,7 @@
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include "version.h"
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
Important Constants Important Constants
@ -65,9 +64,6 @@ static ID id_d_e_pop;
#ifndef LONG2NUM #ifndef LONG2NUM
# define LONG2NUM(i) INT2NUM(i) # define LONG2NUM(i) INT2NUM(i)
#endif #endif
#if RUBY_VERSION_CODE >= 190
# define HAVE_RB_BLOCK_CALL 1
#endif
static ID value_to_id _((VALUE v)); static ID value_to_id _((VALUE v));
static inline long num_to_long _((VALUE n)); static inline long num_to_long _((VALUE n));

1
ext/racc/cparse/extconf.rb
View File

@ -1,4 +1,5 @@
# $Id$ # $Id$
require 'mkmf' require 'mkmf'
have_func('rb_block_call', 'ruby/ruby.h')
create_makefile 'racc/cparse' create_makefile 'racc/cparse'

8
ext/readline/readline.c
View File

@ -5,7 +5,7 @@
#include RUBY_EXTCONF_H #include RUBY_EXTCONF_H
#endif #endif
#include "config.h" #include "ruby/config.h"
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
@ -20,9 +20,9 @@
#include <editline/readline.h> #include <editline/readline.h>
#endif #endif
#include "ruby.h" #include "ruby/ruby.h"
#include "rubyio.h" #include "ruby/io.h"
#include "rubysig.h" #include "ruby/signal.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>

8
ext/ripper/depend
View File

@ -1,11 +1,11 @@
GEN = $(srcdir)/tools/generate.rb GEN = $(srcdir)/tools/generate.rb
SRC1 = $(hdrdir)/parse.y SRC1 = $(top_srcdir)/parse.y
SRC2 = $(srcdir)/eventids2.c SRC2 = $(srcdir)/eventids2.c
BISON = bison BISON = bison
src: ripper.c eventids1.c eventids2table.c 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: .y.c:
$(BISON) -t -v -o$@ $< $(BISON) -t -v -o$@ $<
@ -13,8 +13,8 @@ ripper.o: ripper.c $(topdir)/lex.c eventids1.c $(srcdir)/eventids2.c eventids2ta
all: check all: check
static: check static: check
ripper.y: $(srcdir)/tools/preproc.rb $(hdrdir)/parse.y ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y
$(RUBY) $(srcdir)/tools/preproc.rb $(hdrdir)/parse.y --output=$@ $(RUBY) $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y --output=$@
check: $(GEN) $(SRC1) $(SRC2) check: $(GEN) $(SRC1) $(SRC2)
$(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2) $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2)

6
ext/ripper/extconf.rb
View File

@ -12,8 +12,10 @@ def main
end end
$objs = %w(ripper.o) $objs = %w(ripper.o)
$cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output eventids1.c eventids2table.c) $cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output eventids1.c eventids2table.c)
$CPPFLAGS += ' -DRIPPER' $defs << '-DRIPPER'
$CPPFLAGS += ' -DRIPPER_DEBUG' if $debug $defs << '-DRIPPER_DEBUG' if $debug
$VPATH << '$(topdir)' << '$(top_srcdir)'
$INCFLAGS << ' -I$(topdir) -I$(top_srcdir)'
create_makefile 'ripper' create_makefile 'ripper'
end end

2
ext/sdbm/_sdbm.c
View File

@ -12,7 +12,7 @@
#endif #endif
#include "sdbm.h" #include "sdbm.h"
#include "config.h" #include "ruby/config.h"
/* /*
* sdbm - ndbm work-alike hashed database library * sdbm - ndbm work-alike hashed database library

8
ext/socket/depend
View File

@ -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 socket.o: socket.c $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
getnameinfo.o: getnameinfo.c $(topdir)/config.h addrinfo.h sockport.h $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/io.h $(hdrdir)/ruby/signal.h \
getaddrinfo.o: getaddrinfo.c $(topdir)/config.h addrinfo.h sockport.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 constants.h: $(srcdir)/mkconstants.rb
@echo "generating constants.h" @echo "generating constants.h"

2
ext/socket/getaddrinfo.c
View File

@ -38,7 +38,7 @@
* - PF_UNSPEC case would be handled in getipnodebyname() with the AI_ALL flag. * - PF_UNSPEC case would be handled in getipnodebyname() with the AI_ALL flag.
*/ */
#include "config.h" #include "ruby/config.h"
#include <sys/types.h> #include <sys/types.h>
#ifndef _WIN32 #ifndef _WIN32
#include <sys/param.h> #include <sys/param.h>

2
ext/socket/getnameinfo.c
View File

@ -34,7 +34,7 @@
* but INRIA implementation returns EAI_xxx defined for getaddrinfo(). * but INRIA implementation returns EAI_xxx defined for getaddrinfo().
*/ */
#include "config.h" #include "ruby/config.h"
#include <sys/types.h> #include <sys/types.h>
#ifndef _WIN32 #ifndef _WIN32
#if defined(__BEOS__) #if defined(__BEOS__)

8
ext/socket/socket.c
View File

@ -10,10 +10,10 @@
************************************************/ ************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "rubyio.h" #include "ruby/io.h"
#include "rubysig.h" #include "ruby/signal.h"
#include "util.h" #include "ruby/util.h"
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>

4
ext/stringio/depend
View File

@ -1,2 +1,2 @@
stringio.o: stringio.c $(hdrdir)/ruby.h $(topdir)/config.h \ stringio.o: stringio.c $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
$(hdrdir)/defines.h $(hdrdir)/intern.h $(hdrdir)/rubyio.h $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/io.h

3
ext/strscan/depend
View File

@ -1,3 +1,2 @@
strscan.o: strscan.c $(hdrdir)/ruby.h $(hdrdir)/re.h $(hdrdir)/regex.h \ strscan.o: strscan.c $(hdrdir)/ruby.h $(hdrdir)/re.h $(hdrdir)/regex.h \
$(hdrdir)/regint.h $(hdrdir)/oniguruma.h $(topdir)/config.h \ $(hdrdir)/oniguruma.h $(topdir)/config.h $(hdrdir)/defines.h
$(hdrdir)/defines.h

4
ext/strscan/strscan.c
View File

@ -8,8 +8,8 @@
the Ruby License. For details, see the file COPYING. the Ruby License. For details, see the file COPYING.
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include "re.h" #include "ruby/re.h"
#define STRSCAN_VERSION "0.7.0" #define STRSCAN_VERSION "0.7.0"

2
ext/syck/bytecode.c
View File

@ -8,7 +8,7 @@
* *
* Copyright (C) 2003 why the lucky stiff * Copyright (C) 2003 why the lucky stiff
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include "syck.h" #include "syck.h"
#include "gram.h" #include "gram.h"

2
ext/syck/emitter.c
View File

@ -9,7 +9,7 @@
* All Base64 code from Ruby's pack.c. * All Base64 code from Ruby's pack.c.
* Ruby is Copyright (C) 1993-2003 Yukihiro Matsumoto * Ruby is Copyright (C) 1993-2003 Yukihiro Matsumoto
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

2
ext/syck/handler.c
View File

@ -7,7 +7,7 @@
* Copyright (C) 2003 why the lucky stiff * Copyright (C) 2003 why the lucky stiff
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include "syck.h" #include "syck.h"
SYMID SYMID

2
ext/syck/implicit.c
View File

@ -9,7 +9,7 @@
* Copyright (C) 2003 why the lucky stiff * Copyright (C) 2003 why the lucky stiff
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include "syck.h" #include "syck.h"
#define YYCTYPE char #define YYCTYPE char

2
ext/syck/node.c
View File

@ -7,7 +7,7 @@
* Copyright (C) 2003 why the lucky stiff * Copyright (C) 2003 why the lucky stiff
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include "syck.h" #include "syck.h"
/* /*

2
ext/syck/rubyext.c
View File

@ -8,7 +8,7 @@
* Copyright (C) 2003-2005 why the lucky stiff * Copyright (C) 2003-2005 why the lucky stiff
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include "syck.h" #include "syck.h"
#include <sys/types.h> #include <sys/types.h>
#include <time.h> #include <time.h>

2
ext/syck/syck.c
View File

@ -6,7 +6,7 @@
* *
* Copyright (C) 2003 why the lucky stiff * Copyright (C) 2003 why the lucky stiff
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

2
ext/syck/syck.h
View File

@ -18,7 +18,7 @@
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include "st.h" #include "ruby/st.h"
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {

2
ext/syck/token.c
View File

@ -8,7 +8,7 @@
* *
* Copyright (C) 2003 why the lucky stiff * Copyright (C) 2003 why the lucky stiff
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include "syck.h" #include "syck.h"
#include "gram.h" #include "gram.h"

2
ext/syck/yaml2byte.c
View File

@ -9,7 +9,7 @@
* WARNING WARNING WARNING --- THIS IS *NOT JUST* PLAYING * WARNING WARNING WARNING --- THIS IS *NOT JUST* PLAYING
* ANYMORE! -- WHY HAS EMBRACED THIS AS THE REAL THING! * ANYMORE! -- WHY HAS EMBRACED THIS AS THE REAL THING!
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include <syck.h> #include <syck.h>
#include <assert.h> #include <assert.h>
#define YAMLBYTE_UTF8 #define YAMLBYTE_UTF8

4
ext/syslog/syslog.c
View File

@ -7,8 +7,8 @@
* $Id$ * $Id$
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include "util.h" #include "ruby/util.h"
#include <syslog.h> #include <syslog.h>
/* Syslog class */ /* Syslog class */

2
ext/tk/extconf.rb
View File

@ -307,6 +307,8 @@ if tcltk_framework ||
$INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"] $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
# create # create
$defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
$defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
create_makefile("tcltklib") create_makefile("tcltklib")
end end
end end

2
ext/tk/stubs.c
View File

@ -1,5 +1,5 @@
#include "stubs.h" #include "stubs.h"
#include "ruby.h" #include "ruby/ruby.h"
#include <tcl.h> #include <tcl.h>
#include <tk.h> #include <tk.h>

5
ext/tk/tcltklib.c
View File

@ -6,9 +6,8 @@
#define TCLTKLIB_RELEASE_DATE "2006-12-01" #define TCLTKLIB_RELEASE_DATE "2006-12-01"
#include "ruby.h" #include "ruby/ruby.h"
#include "rubysig.h" #include "ruby/signal.h"
#include "version.h"
#undef EXTERN /* avoid conflict with tcl.h of tcl8.2 or before */ #undef EXTERN /* avoid conflict with tcl.h of tcl8.2 or before */
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_STDARG_PROTOTYPES #ifdef HAVE_STDARG_PROTOTYPES

1
ext/tk/tkutil/extconf.rb
View File

@ -7,5 +7,6 @@ end
if has_tk if has_tk
require 'mkmf' require 'mkmf'
have_func("rb_obj_instance_exec", "ruby.h")
create_makefile('tkutil') create_makefile('tkutil')
end end

9
ext/tk/tkutil/tkutil.c
View File

@ -10,10 +10,9 @@
#define TKUTIL_RELEASE_DATE "2006-04-06" #define TKUTIL_RELEASE_DATE "2006-04-06"
#include "ruby.h" #include "ruby/ruby.h"
#include "rubysig.h" #include "ruby/signal.h"
#include "version.h" #include "ruby/st.h"
#include "st.h"
static VALUE cMethod; static VALUE cMethod;
@ -59,7 +58,7 @@ tk_s_new(argc, argv, klass)
VALUE obj = rb_class_new_instance(argc, argv, klass); VALUE obj = rb_class_new_instance(argc, argv, klass);
if (rb_block_given_p()) { 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); rb_obj_instance_eval(0, 0, obj);
#else #else
rb_obj_instance_exec(1, &obj, obj); rb_obj_instance_exec(1, &obj, obj);

15
ext/win32ole/win32ole.c
View File

@ -16,8 +16,8 @@
modified for win32ole (ruby) by Masaki.Suketa <masaki.suketa@nifty.ne.jp> modified for win32ole (ruby) by Masaki.Suketa <masaki.suketa@nifty.ne.jp>
*/ */
#include "ruby.h" #include "ruby/ruby.h"
#include "st.h" #include "ruby/st.h"
#include <ctype.h> #include <ctype.h>
#include <windows.h> #include <windows.h>
#include <ocidl.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); val1 = ole_ary_m_entry(val, pid);
p = val2variant_ptr(val1, &var, vt); p = val2variant_ptr(val1, &var, vt);
if (is_all_index_under(pid, pub, dim) == Qtrue) { if (is_all_index_under(pid, pub, dim) == Qtrue) {
if (V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL || if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) ||
V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL) { (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) {
rb_raise(eWIN32OLERuntimeError, "argument does not have IDispatch or IUnknown Interface"); rb_raise(eWIN32OLERuntimeError, "argument does not have IDispatch or IUnknown Interface");
} }
hr = SafeArrayPutElement(psa, pid, p); hr = SafeArrayPutElement(psa, pid, p);
@ -2669,7 +2669,7 @@ fole_s_set_locale(VALUE self, VALUE vlcid)
cWIN32OLE_lcid = lcid; cWIN32OLE_lcid = lcid;
break; break;
default: default:
rb_raise(eWIN32OLERuntimeError, "not installed locale: %d", lcid); rb_raise(eWIN32OLERuntimeError, "not installed locale: %u", (unsigned int)lcid);
} }
} }
return Qnil; return Qnil;
@ -7827,7 +7827,6 @@ folevariant_ary_aset(int argc, VALUE *argv, VALUE self)
{ {
struct olevariantdata *pvar; struct olevariantdata *pvar;
SAFEARRAY *psa; SAFEARRAY *psa;
VALUE val = Qnil;
VARIANT var; VARIANT var;
VARTYPE vt; VARTYPE vt;
long *pid; long *pid;
@ -7849,8 +7848,8 @@ folevariant_ary_aset(int argc, VALUE *argv, VALUE self)
VariantInit(&var); VariantInit(&var);
vt = (V_VT(&(pvar->var)) & ~VT_ARRAY); vt = (V_VT(&(pvar->var)) & ~VT_ARRAY);
p = val2variant_ptr(argv[argc-1], &var, vt); p = val2variant_ptr(argv[argc-1], &var, vt);
if (V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL || if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) ||
V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL) { (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) {
rb_raise(eWIN32OLERuntimeError, "argument does not have IDispatch or IUnknown Interface"); rb_raise(eWIN32OLERuntimeError, "argument does not have IDispatch or IUnknown Interface");
} }
hr = SafeArrayPutElement(psa, pid, p); hr = SafeArrayPutElement(psa, pid, p);

8
file.c
View File

@ -16,10 +16,10 @@
#include "missing/file.h" #include "missing/file.h"
#endif #endif
#include "ruby.h" #include "ruby/ruby.h"
#include "rubyio.h" #include "ruby/io.h"
#include "rubysig.h" #include "ruby/signal.h"
#include "util.h" #include "ruby/util.h"
#include "dln.h" #include "dln.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H

10
gc.c
View File

@ -12,11 +12,11 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "rubysig.h" #include "ruby/signal.h"
#include "st.h" #include "ruby/st.h"
#include "node.h" #include "ruby/node.h"
#include "re.h" #include "ruby/re.h"
#include "yarvcore.h" #include "yarvcore.h"
#include "gc.h" #include "gc.h"
#include <stdio.h> #include <stdio.h>

8
hash.c
View File

@ -12,10 +12,10 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "st.h" #include "ruby/st.h"
#include "util.h" #include "ruby/util.h"
#include "rubysig.h" #include "ruby/signal.h"
#ifdef __APPLE__ #ifdef __APPLE__
#include <crt_externs.h> #include <crt_externs.h>

1
include/ruby.h Normal file
View File

@ -0,0 +1 @@
#include <ruby/ruby.h>

21
defines.h → include/ruby/defines.h
View File

@ -7,8 +7,16 @@
created at: Wed May 18 00:21:44 JST 1994 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 #define RUBY
@ -185,7 +193,7 @@ void xfree(void*);
#endif /* NeXT */ #endif /* NeXT */
#ifdef _WIN32 #ifdef _WIN32
#include "win32/win32.h" #include "ruby/win32.h"
#endif #endif
#if defined(__VMS) #if defined(__VMS)
@ -266,4 +274,11 @@ void rb_ia64_flushrs(void);
#define RUBY_PLATFORM "unknown-unknown" #define RUBY_PLATFORM "unknown-unknown"
#endif #endif
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
#endif #endif
} /* extern "C" { */
#endif
#endif /* RUBY_DEFINES_H */

16
intern.h → include/ruby/intern.h
View File

@ -15,12 +15,19 @@
#ifndef RUBY_INTERN_H #ifndef RUBY_INTERN_H
#define RUBY_INTERN_H 1 #define RUBY_INTERN_H 1
#if defined(__cplusplus)
extern "C" {
#if 0
} /* satisfy cc-mode */
#endif
#endif
#ifdef HAVE_STDARG_PROTOTYPES #ifdef HAVE_STDARG_PROTOTYPES
# include <stdarg.h> # include <stdarg.h>
#else #else
# include <varargs.h> # include <varargs.h>
#endif #endif
#include <st.h> #include <ruby/st.h>
/* /*
* Functions and variables that are used by more than one source file of * 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); void rb_frame_pop(void);
NORETURN(void rb_thread_start_1(void)); NORETURN(void rb_thread_start_1(void));
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
#endif
} /* extern "C" { */
#endif
#endif /* RUBY_INTERN_H */ #endif /* RUBY_INTERN_H */

19
rubyio.h → include/ruby/io.h
View File

@ -10,8 +10,15 @@
**********************************************************************/ **********************************************************************/
#ifndef RUBYIO_H #ifndef RUBY_IO_H
#define RUBYIO_H #define RUBY_IO_H 1
#if defined(__cplusplus)
extern "C" {
#if 0
} /* satisfy cc-mode */
#endif
#endif
#include <stdio.h> #include <stdio.h>
#include <errno.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_fread(char *, long, FILE *));
DEPRECATED(long rb_io_fwrite(const char *, long, FILE *)); DEPRECATED(long rb_io_fwrite(const char *, long, FILE *));
DEPRECATED(int rb_read_pending(FILE*)); DEPRECATED(int rb_read_pending(FILE*));
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
#endif #endif
} /* extern "C" { */
#endif
#endif /* RUBY_IO_H */

20
missing.h → include/ruby/missing.h
View File

@ -9,8 +9,15 @@
************************************************/ ************************************************/
#ifndef MISSING_H #ifndef RUBY_MISSING_H
#define 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) #if defined(HAVE_SYS_TIME_H)
# include <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); extern size_t strlcat(char *, const char*, size_t);
#endif #endif
#endif /* MISSING_H */ #if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
#endif
} /* extern "C" { */
#endif
#endif /* RUBY_MISSING_H */

12
node.h → include/ruby/node.h
View File

@ -10,11 +10,14 @@
**********************************************************************/ **********************************************************************/
#ifndef NODE_H #ifndef RUBY_NODE_H
#define NODE_H #define RUBY_NODE_H 1
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#if 0
} /* satisfy cc-mode */
#endif
#endif #endif
enum node_type { enum node_type {
@ -388,7 +391,10 @@ VALUE rb_gvar_set(struct global_entry *, VALUE);
VALUE rb_gvar_defined(struct global_entry *); VALUE rb_gvar_defined(struct global_entry *);
#if defined(__cplusplus) #if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
#endif
} /* extern "C" { */ } /* extern "C" { */
#endif #endif
#endif #endif /* RUBY_NODE_H */

6
oniguruma.h → include/ruby/oniguruma.h
View File

@ -31,6 +31,9 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#if 0
} /* satisfy cc-mode */
#endif
#endif #endif
#define ONIGURUMA #define ONIGURUMA
@ -804,6 +807,9 @@ ONIG_EXTERN
const char* onig_copyright P_((void)); const char* onig_copyright P_((void));
#ifdef __cplusplus #ifdef __cplusplus
#if 0
{ /* satisfy cc-mode */
#endif
} }
#endif #endif

21
re.h → include/ruby/re.h
View File

@ -10,13 +10,20 @@
**********************************************************************/ **********************************************************************/
#ifndef RE_H #ifndef RUBY_RE_H
#define RE_H #define RUBY_RE_H 1
#if defined(__cplusplus)
extern "C" {
#if 0
} /* satisfy cc-mode */
#endif
#endif
#include <sys/types.h> #include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include "regex.h" #include "ruby/regex.h"
typedef struct re_pattern_buffer Regexp; typedef struct re_pattern_buffer Regexp;
@ -40,4 +47,12 @@ RUBY_EXTERN int ruby_ignorecase;
int rb_reg_mbclen2(unsigned int, VALUE); int rb_reg_mbclen2(unsigned int, VALUE);
#define mbclen2(c,re) rb_reg_mbclen2((c),(re)) #define mbclen2(c,re) rb_reg_mbclen2((c),(re))
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
#endif #endif
} /* extern "C" { */
#endif
#endif /* RUBY_RE_H */

24
regex.h → include/ruby/regex.h
View File

@ -9,10 +9,21 @@
**********************************************************************/ **********************************************************************/
#ifndef REGEX_H #ifndef ONIGURUMA_REGEX_H
#define REGEX_H #define ONIGURUMA_REGEX_H 1
#if defined(__cplusplus)
extern "C" {
#if 0
} /* satisfy cc-mode */
#endif
#endif
#ifdef RUBY
#include "ruby/oniguruma.h"
#else
#include "oniguruma.h" #include "oniguruma.h"
#endif
#ifndef ONIG_RUBY_M17N #ifndef ONIG_RUBY_M17N
@ -25,4 +36,11 @@ ONIG_EXTERN OnigEncoding OnigEncDefaultCharEncoding;
#endif /* ifndef ONIG_RUBY_M17N */ #endif /* ifndef ONIG_RUBY_M17N */
#endif /* !REGEX_H */ #if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
#endif
} /* extern "C" { */
#endif
#endif /* ONIGURUMA_REGEX_H */

10
ruby.h → include/ruby/ruby.h
View File

@ -12,7 +12,7 @@
**********************************************************************/ **********************************************************************/
#ifndef RUBY_H #ifndef RUBY_H
#define RUBY_H #define RUBY_H 1
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
@ -21,7 +21,7 @@ extern "C" {
#endif #endif
#endif #endif
#include "config.h" #include "ruby/config.h"
#ifdef RUBY_EXTCONF_H #ifdef RUBY_EXTCONF_H
#include RUBY_EXTCONF_H #include RUBY_EXTCONF_H
#endif #endif
@ -805,8 +805,8 @@ rb_special_const_p(VALUE obj)
return Qfalse; return Qfalse;
} }
#include "missing.h" #include "ruby/missing.h"
#include "intern.h" #include "ruby/intern.h"
#if defined(EXTLIB) && defined(USE_DLN_A_OUT) #if defined(EXTLIB) && defined(USE_DLN_A_OUT)
/* hook for external modules */ /* hook for external modules */
@ -823,4 +823,4 @@ static char *dln_libs_to_be_linked[] = { EXTLIB, 0 };
} /* extern "C" { */ } /* extern "C" { */
#endif #endif
#endif /* ifndef RUBY_H */ #endif /* RUBY_H */

19
rubysig.h → include/ruby/signal.h
View File

@ -11,7 +11,15 @@
**********************************************************************/ **********************************************************************/
#ifndef RUBYSIG_H #ifndef RUBYSIG_H
#define RUBYSIG_H #define RUBYSIG_H 1
#if defined(__cplusplus)
extern "C" {
#if 0
} /* satisfy cc-mode */
#endif
#endif
#include <errno.h> #include <errno.h>
#ifdef _WIN32 #ifdef _WIN32
@ -75,4 +83,11 @@ void rb_trap_restore_mask(void);
RUBY_EXTERN int rb_thread_critical; RUBY_EXTERN int rb_thread_critical;
void rb_thread_schedule(void); void rb_thread_schedule(void);
#endif /* ifndef RUBYSIG_H */ #if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
#endif
} /* extern "C" { */
#endif
#endif /* RUBYSIG_H */

19
st.h → include/ruby/st.h
View File

@ -2,9 +2,15 @@
/* @(#) st.h 5.1 89/12/14 */ /* @(#) st.h 5.1 89/12/14 */
#ifndef ST_INCLUDED #ifndef RUBY_ST_H
#define RUBY_ST_H 1
#define ST_INCLUDED #if defined(__cplusplus)
extern "C" {
#if 0
} /* satisfy cc-mode */
#endif
#endif
#if SIZEOF_LONG == SIZEOF_VOIDP #if SIZEOF_LONG == SIZEOF_VOIDP
typedef unsigned long st_data_t; typedef unsigned long st_data_t;
@ -63,4 +69,11 @@ st_table *st_copy(st_table *);
int st_numcmp(long, long); int st_numcmp(long, long);
int st_numhash(long); int st_numhash(long);
#endif /* ST_INCLUDED */ #if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
#endif
} /* extern "C" { */
#endif
#endif /* RUBY_ST_H */

20
util.h → include/ruby/util.h
View File

@ -10,8 +10,15 @@
**********************************************************************/ **********************************************************************/
#ifndef UTIL_H #ifndef RUBY_UTIL_H
#define UTIL_H #define RUBY_UTIL_H 1
#if defined(__cplusplus)
extern "C" {
#if 0
} /* satisfy cc-mode */
#endif
#endif
#ifndef _ #ifndef _
#ifdef __cplusplus #ifdef __cplusplus
@ -64,4 +71,11 @@ double ruby_strtod(const char *, char **);
#undef strtod #undef strtod
#define strtod(s,e) ruby_strtod(s,e) #define strtod(s,e) ruby_strtod(s,e)
#endif /* UTIL_H */ #if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
#endif
} /* extern "C" { */
#endif
#endif /* RUBY_UTIL_H */

16
win32/win32.h → include/ruby/win32.h
View File

@ -1,5 +1,12 @@
#ifndef RUBY_WIN32_H #ifndef RUBY_WIN32_H
#define RUBY_WIN32_H #define RUBY_WIN32_H 1
#if defined(__cplusplus)
extern "C" {
#if 0
} /* satisfy cc-mode */
#endif
#endif
/* /*
* Copyright (c) 1993, Intergraph Corporation * Copyright (c) 1993, Intergraph Corporation
@ -527,4 +534,11 @@ in asynchronous_func_t.
typedef DWORD (*asynchronous_func_t)(DWORD self, int argc, DWORD* argv); typedef DWORD (*asynchronous_func_t)(DWORD self, int argc, DWORD* argv);
DWORD rb_w32_asynchronize(asynchronous_func_t func, DWORD self, int argc, DWORD* argv, DWORD intrval); DWORD rb_w32_asynchronize(asynchronous_func_t func, DWORD self, int argc, DWORD* argv, DWORD intrval);
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
#endif #endif
} /* extern "C" { */
#endif
#endif /* RUBY_WIN32_H */

1
include/rubyio.h Normal file
View File

@ -0,0 +1 @@
#include <ruby/io.h>

1
include/rubysig.h Normal file
View File

@ -0,0 +1 @@
#include <ruby/signal.h>

2
inits.c
View File

@ -10,7 +10,7 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
void Init_Array(void); void Init_Array(void);
void Init_Bignum(void); void Init_Bignum(void);

31
instruby.rb
View File

@ -127,7 +127,14 @@ def install_recursive(srcdir, dest, options = {})
subpath = srcdir.size..-1 subpath = srcdir.size..-1
Dir.glob("#{srcdir}/**/*", File::FNM_DOTMATCH) do |src| Dir.glob("#{srcdir}/**/*", File::FNM_DOTMATCH) do |src|
next if /\A\.{1,2}\z/ =~ (base = File.basename(src)) next if /\A\.{1,2}\z/ =~ (base = File.basename(src))
next if noinst and File.fnmatch?(noinst, File.basename(src)) if noinst
base = File.basename(src)
if Array === noinst
next if noinst.any? {|n| File.fnmatch?(n, base)}
else
next if File.fnmatch?(noinst, base)
end
end
d = dest + src[subpath] d = dest + src[subpath]
if File.directory?(src) if File.directory?(src)
makedirs(d) makedirs(d)
@ -158,6 +165,8 @@ rubyw_install_name = CONFIG["rubyw_install_name"]
version = CONFIG["ruby_version"] version = CONFIG["ruby_version"]
bindir = CONFIG["bindir"] bindir = CONFIG["bindir"]
libdir = CONFIG["libdir"] libdir = CONFIG["libdir"]
archhdrdir = rubyhdrdir = CONFIG["rubyhdrdir"]
archhdrdir += "/" + CONFIG["arch"]
rubylibdir = CONFIG["rubylibdir"] rubylibdir = CONFIG["rubylibdir"]
archlibdir = CONFIG["archdir"] archlibdir = CONFIG["archdir"]
sitelibdir = CONFIG["sitelibdir"] sitelibdir = CONFIG["sitelibdir"]
@ -172,7 +181,7 @@ arc = CONFIG["LIBRUBY_A"]
install?(:local, :arch, :bin) do install?(:local, :arch, :bin) do
puts "installing binary commands" puts "installing binary commands"
makedirs [bindir, libdir, archlibdir] makedirs [bindir, libdir, archlibdir, archhdrdir]
install ruby_install_name+exeext, bindir, :mode => 0755 install ruby_install_name+exeext, bindir, :mode => 0755
if rubyw_install_name and !rubyw_install_name.empty? if rubyw_install_name and !rubyw_install_name.empty?
@ -183,7 +192,6 @@ install?(:local, :arch, :bin) do
end end
install lib, libdir, :mode => 0755 unless lib == arc install lib, libdir, :mode => 0755 unless lib == arc
install arc, libdir, :mode => 0644 install arc, libdir, :mode => 0644
install "config.h", archlibdir, :mode => 0644
install "rbconfig.rb", archlibdir, :mode => 0644 install "rbconfig.rb", archlibdir, :mode => 0644
if CONFIG["ARCHFILE"] if CONFIG["ARCHFILE"]
for file in CONFIG["ARCHFILE"].split for file in CONFIG["ARCHFILE"].split
@ -207,11 +215,13 @@ if $extout
noinst = nil noinst = nil
end end
install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst) install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst)
install_recursive("#{extout}/include/#{CONFIG['arch']}", archhdrdir)
end end
install?(:ext, :comm, :'ext-comm') do install?(:ext, :comm, :'ext-comm') do
puts "installing extension scripts" puts "installing extension scripts"
makedirs [rubylibdir, sitelibdir] makedirs [rubylibdir, sitelibdir]
install_recursive("#{extout}/common", rubylibdir) install_recursive("#{extout}/common", rubylibdir)
install_recursive("#{extout}/include", rubyhdrdir)
end end
end end
@ -297,16 +307,13 @@ install?(:local, :arch, :lib) do
puts "installing headers" puts "installing headers"
Dir.chdir(srcdir) Dir.chdir(srcdir)
makedirs [archlibdir] makedirs [rubyhdrdir]
for f in Dir["*.h"] noinst = []
install f, archlibdir, :mode => 0644 unless RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/
end noinst << "win32.h"
if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/
win32libdir = File.join(archlibdir, "win32")
makedirs win32libdir
install "win32/win32.h", win32libdir, :mode => 0644
end end
noinst = nil if noinst.empty?
install_recursive("include", rubyhdrdir, :no_install => noinst)
end end
install?(:local, :comm, :man) do install?(:local, :comm, :man) do

8
io.c
View File

@ -12,9 +12,9 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "rubyio.h" #include "ruby/io.h"
#include "rubysig.h" #include "ruby/signal.h"
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
@ -87,7 +87,7 @@ extern void Init_File(void);
#include <net/socket.h> #include <net/socket.h>
#endif #endif
#include "util.h" #include "ruby/util.h"
#ifndef O_ACCMODE #ifndef O_ACCMODE
#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)

4
iseq.c
View File

@ -10,8 +10,8 @@
**********************************************************************/ **********************************************************************/
#include <ruby.h> #include "ruby/ruby.h"
#include <node.h> #include "ruby/node.h"
#include "yarvcore.h" #include "yarvcore.h"
#include "insns.inc" #include "insns.inc"

66
lib/mkmf.rb
View File

@ -73,11 +73,13 @@ end
INSTALL_DIRS = [ INSTALL_DIRS = [
[dir_re('commondir'), "$(RUBYCOMMONDIR)"], [dir_re('commondir'), "$(RUBYCOMMONDIR)"],
[dir_re("sitedir"), "$(RUBYCOMMONDIR)"], [dir_re('sitedir'), "$(RUBYCOMMONDIR)"],
[dir_re('rubylibdir'), "$(RUBYLIBDIR)"], [dir_re('rubylibdir'), "$(RUBYLIBDIR)"],
[dir_re('archdir'), "$(RUBYARCHDIR)"], [dir_re('archdir'), "$(RUBYARCHDIR)"],
[dir_re('sitelibdir'), "$(RUBYLIBDIR)"], [dir_re('sitelibdir'), "$(RUBYLIBDIR)"],
[dir_re('sitearchdir'), "$(RUBYARCHDIR)"] [dir_re('sitearchdir'), "$(RUBYARCHDIR)"],
[dir_re('rubyhdrdir'), "$(RUBYHDRDIR)"],
[dir_re('sitehdrdir'), "$(SITEHDRDIR)"],
] ]
def install_dirs(target_prefix = nil) def install_dirs(target_prefix = nil)
@ -86,6 +88,8 @@ def install_dirs(target_prefix = nil)
['RUBYCOMMONDIR', '$(extout)/common'], ['RUBYCOMMONDIR', '$(extout)/common'],
['RUBYLIBDIR', '$(RUBYCOMMONDIR)$(target_prefix)'], ['RUBYLIBDIR', '$(RUBYCOMMONDIR)$(target_prefix)'],
['RUBYARCHDIR', '$(extout)/$(arch)$(target_prefix)'], ['RUBYARCHDIR', '$(extout)/$(arch)$(target_prefix)'],
['HDRDIR', '$(extout)/include/ruby$(target_prefix)'],
['ARCHHDRDIR', '$(extout)/include/$(arch)/ruby$(target_prefix)'],
['extout', "#$extout"], ['extout', "#$extout"],
['extout_prefix', "#$extout_prefix"], ['extout_prefix', "#$extout_prefix"],
] ]
@ -94,12 +98,16 @@ def install_dirs(target_prefix = nil)
['RUBYCOMMONDIR', '$(rubylibdir)'], ['RUBYCOMMONDIR', '$(rubylibdir)'],
['RUBYLIBDIR', '$(rubylibdir)$(target_prefix)'], ['RUBYLIBDIR', '$(rubylibdir)$(target_prefix)'],
['RUBYARCHDIR', '$(archdir)$(target_prefix)'], ['RUBYARCHDIR', '$(archdir)$(target_prefix)'],
['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'],
['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
] ]
else else
dirs = [ n dirs = [
['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'], ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'], ['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'],
['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'], ['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'],
['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'],
['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
] ]
end end
dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")] dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]
@ -114,11 +122,13 @@ end
topdir = File.dirname(libdir = File.dirname(__FILE__)) topdir = File.dirname(libdir = File.dirname(__FILE__))
extdir = File.expand_path("ext", topdir) extdir = File.expand_path("ext", topdir)
$extmk = File.expand_path($0)[0, extdir.size+1] == extdir+"/" $extmk = File.expand_path($0)[0, extdir.size+1] == extdir+"/"
if not $extmk and File.exist?(RbConfig::CONFIG["archdir"] + "/ruby.h") if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
$hdrdir = $topdir = RbConfig::CONFIG["archdir"] $topdir = $hdrdir
elsif File.exist?(($top_srcdir ||= topdir) + "/ruby.h") and $arch_hdrdir = $hdrdir + "/$(arch)"
File.exist?(($topdir ||= RbConfig::CONFIG["topdir"]) + "/config.h") elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h") and
$hdrdir = $top_srcdir File.exist?("#{CONFIG["EXTOUT"]}/include/#{CONFIG["arch"]}/ruby/config.h")
$topdir ||= RbConfig::CONFIG["topdir"]
$arch_hdrdir = "$(extout)/include/$(arch)"
else else
abort "can't find header files for ruby." abort "can't find header files for ruby."
end end
@ -126,11 +136,11 @@ end
OUTFLAG = CONFIG['OUTFLAG'] OUTFLAG = CONFIG['OUTFLAG']
CPPOUTFILE = CONFIG['CPPOUTFILE'] CPPOUTFILE = CONFIG['CPPOUTFILE']
CONFTEST_C = "conftest.c" CONFTEST_C = "conftest.c".freeze
class String class String
def quote def quote
/\s/ =~ self ? "\"#{self}\"" : self /\s/ =~ self ? "\"#{self}\"" : "#{self}"
end end
end end
class Array class Array
@ -269,8 +279,10 @@ def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
RbConfig::expand(TRY_LINK.dup, RbConfig::expand(TRY_LINK.dup,
CONFIG.merge('hdrdir' => $hdrdir.quote, CONFIG.merge('hdrdir' => $hdrdir.quote,
'src' => CONFTEST_C, 'src' => CONFTEST_C,
'INCFLAGS' => $INCFLAGS, 'arch_hdrdir' => "#$arch_hdrdir",
'CPPFLAGS' => $CPPFLAGS, 'top_srcdir' => $top_srcdir.quote,
'INCFLAGS' => "#$INCFLAGS",
'CPPFLAGS' => "#$CPPFLAGS",
'CFLAGS' => "#$CFLAGS", 'CFLAGS' => "#$CFLAGS",
'ARCH_FLAG' => "#$ARCH_FLAG", 'ARCH_FLAG' => "#$ARCH_FLAG",
'LDFLAGS' => "#$LDFLAGS #{ldflags}", 'LDFLAGS' => "#$LDFLAGS #{ldflags}",
@ -281,12 +293,16 @@ end
def cc_command(opt="") def cc_command(opt="")
RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}", RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)) CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
'arch_hdrdir' => "#$arch_hdrdir",
'top_srcdir' => $top_srcdir.quote))
end end
def cpp_command(outfile, opt="") def cpp_command(outfile, opt="")
RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}", RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)) CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
'arch_hdrdir' => "#$arch_hdrdir",
'top_srcdir' => $top_srcdir.quote))
end end
def libpathflag(libpath=$DEFLIBPATH|$LIBPATH) def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
@ -1037,12 +1053,12 @@ end
def configuration(srcdir) def configuration(srcdir)
mk = [] mk = []
vpath = %w[$(srcdir) $(topdir) $(hdrdir)] vpath = $VPATH.dup
if !CROSS_COMPILING if !CROSS_COMPILING
case CONFIG['build_os'] case CONFIG['build_os']
when 'cygwin' when 'cygwin'
if CONFIG['target_os'] != 'cygwin' if CONFIG['target_os'] != 'cygwin'
vpath.each {|p| p.sub!(/.*/, '$(shell cygpath -u \&)')} vpath = vpath.map {|p| p.sub(/.*/, '$(shell cygpath -u \&)')}
end end
when 'msdosdjgpp', 'mingw32' when 'msdosdjgpp', 'mingw32'
CONFIG['PATH_SEPARATOR'] = ';' CONFIG['PATH_SEPARATOR'] = ';'
@ -1053,10 +1069,15 @@ def configuration(srcdir)
SHELL = /bin/sh SHELL = /bin/sh
#### Start of system configuration section. #### #### Start of system configuration section. ####
#{
if $extmk
"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/")
end
}
srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}.quote} srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}.quote}
topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote} topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote}
hdrdir = #{$extmk ? CONFIG["hdrdir"].quote : '$(topdir)'} hdrdir = #{CONFIG["hdrdir"].quote}
arch_hdrdir = #{$arch_hdrdir}
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
} }
if $extmk if $extmk
@ -1071,7 +1092,8 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
end end
CONFIG.each do |key, var| CONFIG.each do |key, var|
next if /^abs_/ =~ key next if /^abs_/ =~ key
next unless /^(?:src|top|hdr|(.*))dir$/ =~ key and $1 next if /^(?:src|top|hdr)dir$/ =~ key
next unless /dir$/ =~ key
mk << "#{key} = #{with_destdir(var)}\n" mk << "#{key} = #{with_destdir(var)}\n"
end end
if !$extmk and !$configure_args.has_key?('--ruby') and if !$extmk and !$configure_args.has_key?('--ruby') and
@ -1397,7 +1419,8 @@ site-install-rb: install-rb
end end
while line = dfile.gets() while line = dfile.gets()
line.gsub!(/\.o\b/, ".#{$OBJEXT}") line.gsub!(/\.o\b/, ".#{$OBJEXT}")
line.gsub!(/\$\(hdrdir\)\/config.h/, $config_h) if $config_h line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h) if $config_h
line.gsub!(%r"\$\(hdrdir\)/(?!ruby/)", '\&ruby/')
if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line
(cont ||= []) << line (cont ||= []) << line
next next
@ -1442,7 +1465,7 @@ def init_mkmf(config = CONFIG)
$ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup
$CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup
$LDFLAGS = with_config("ldflags", arg_config("LDFLAGS", config["LDFLAGS"])).dup $LDFLAGS = with_config("ldflags", arg_config("LDFLAGS", config["LDFLAGS"])).dup
$INCFLAGS = "-I$(topdir) -I$(hdrdir) -I$(srcdir)" $INCFLAGS = "-I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir)"
$DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup
$LIBEXT = config['LIBEXT'].dup $LIBEXT = config['LIBEXT'].dup
$OBJEXT = config["OBJEXT"].dup $OBJEXT = config["OBJEXT"].dup
@ -1454,6 +1477,7 @@ def init_mkmf(config = CONFIG)
$DEFLIBPATH.unshift(".") $DEFLIBPATH.unshift(".")
$LIBPATH = [] $LIBPATH = []
$INSTALLFILES = nil $INSTALLFILES = nil
$VPATH = %w[$(srcdir) $(arch_hdrdir)/ruby $(hdrdir)/ruby]
$objs = nil $objs = nil
$srcs = nil $srcs = nil

2
main.c
View File

@ -11,7 +11,7 @@
**********************************************************************/ **********************************************************************/
#undef RUBY_EXPORT #undef RUBY_EXPORT
#include "ruby.h" #include "ruby/ruby.h"
#if defined(__MACOS__) && defined(__MWERKS__) #if defined(__MACOS__) && defined(__MWERKS__)
#include <console.h> #include <console.h>

8
marshal.c
View File

@ -10,10 +10,10 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "rubyio.h" #include "ruby/io.h"
#include "st.h" #include "ruby/st.h"
#include "util.h" #include "ruby/util.h"
#include <math.h> #include <math.h>
#ifdef HAVE_FLOAT_H #ifdef HAVE_FLOAT_H

2
math.c
View File

@ -10,7 +10,7 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include <math.h> #include <math.h>
#include <errno.h> #include <errno.h>

2
missing/flock.c
View File

@ -1,4 +1,4 @@
#include "config.h" #include "ruby/config.h"
#if defined _WIN32 #if defined _WIN32
#elif defined HAVE_FCNTL && defined HAVE_FCNTL_H #elif defined HAVE_FCNTL && defined HAVE_FCNTL_H

2
missing/strftime.c
View File

@ -45,7 +45,7 @@
* January 1996 * January 1996
*/ */
#include "config.h" #include "ruby/config.h"
#ifndef GAWK #ifndef GAWK
#include <stdio.h> #include <stdio.h>

2
numeric.c
View File

@ -10,7 +10,7 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>

11
object.c
View File

@ -12,9 +12,10 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "st.h" #include "ruby/st.h"
#include "util.h" #include "ruby/util.h"
#include "debug.h"
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
@ -384,7 +385,7 @@ rb_obj_is_instance_of(VALUE obj, VALUE c)
* b.kind_of? C #=> false * b.kind_of? C #=> false
* b.kind_of? M #=> true * b.kind_of? M #=> true
*/ */
#include "debug.h"
VALUE VALUE
rb_obj_is_kind_of(VALUE obj, VALUE c) rb_obj_is_kind_of(VALUE obj, VALUE c)
{ {
@ -1675,7 +1676,7 @@ rb_obj_public_methods(int argc, VALUE *argv, VALUE obj)
* fred.instance_variable_get(:@a) #=> "cat" * fred.instance_variable_get(:@a) #=> "cat"
* fred.instance_variable_get("@b") #=> 99 * fred.instance_variable_get("@b") #=> 99
*/ */
#include "debug.h"
static VALUE static VALUE
rb_obj_ivar_get(VALUE obj, VALUE iv) rb_obj_ivar_get(VALUE obj, VALUE iv)
{ {

2
pack.c
View File

@ -10,7 +10,7 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include <sys/types.h> #include <sys/types.h>
#include <ctype.h> #include <ctype.h>

12
parse.y
View File

@ -16,10 +16,10 @@
#define YYERROR_VERBOSE 1 #define YYERROR_VERBOSE 1
#define YYSTACK_USE_ALLOCA 0 #define YYSTACK_USE_ALLOCA 0
#include "ruby.h" #include "ruby/ruby.h"
#include "intern.h" #include "ruby/intern.h"
#include "node.h" #include "ruby/node.h"
#include "st.h" #include "ruby/st.h"
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
@ -4544,8 +4544,8 @@ ripper_dispatch_delayed_token(struct parser_params *parser, int t)
} }
#endif /* RIPPER */ #endif /* RIPPER */
#include "regex.h" #include "ruby/regex.h"
#include "util.h" #include "ruby/util.h"
/* We remove any previous definition of `SIGN_EXTEND_CHAR', /* We remove any previous definition of `SIGN_EXTEND_CHAR',
since ours (we hope) works properly with all combinations of since ours (we hope) works properly with all combinations of

2
prec.c
View File

@ -10,7 +10,7 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
VALUE rb_mPrecision; VALUE rb_mPrecision;

6
process.c
View File

@ -12,8 +12,8 @@
**********************************************************************/ **********************************************************************/
#include "ruby.h" #include "ruby/ruby.h"
#include "rubysig.h" #include "ruby/signal.h"
#include "yarvcore.h" #include "yarvcore.h"
#include <stdio.h> #include <stdio.h>
@ -50,7 +50,7 @@ struct timeval rb_time_interval(VALUE);
#ifdef HAVE_SYS_RESOURCE_H #ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h> # include <sys/resource.h>
#endif #endif
#include "st.h" #include "ruby/st.h"
#ifdef __EMX__ #ifdef __EMX__
#undef HAVE_GETPGRP #undef HAVE_GETPGRP

2
random.c
View File

@ -176,7 +176,7 @@ genrand_real(void)
/* These real versions are due to Isaku Wada, 2002/01/09 added */ /* These real versions are due to Isaku Wada, 2002/01/09 added */
#include "ruby.h" #include "ruby/ruby.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>

Some files were not shown because too many files have changed in this diff Show More