diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Setup | 2 | ||||
| -rw-r--r-- | ext/Win32API/extconf.rb | 10 | ||||
| -rw-r--r-- | ext/extmk.rb.nt | 6 | ||||
| -rw-r--r-- | ext/socket/depend | 2 | ||||
| -rw-r--r-- | ext/tcltklib/tcltklib.c | 8 | ||||
| -rw-r--r-- | ext/tkutil/tkutil.c | 3 |
6 files changed, 17 insertions, 14 deletions
@@ -1,7 +1,7 @@ #option nodynamic #GD -#curses +curses #dbm #etc #fcntl diff --git a/ext/Win32API/extconf.rb b/ext/Win32API/extconf.rb index 78b5f6a1e8..a03f358593 100644 --- a/ext/Win32API/extconf.rb +++ b/ext/Win32API/extconf.rb @@ -1,7 +1,7 @@ -if PLATFORM =~ /win32/i - $:.unshift '../..' - require 'rbconfig' - include Config - $CFLAGS = "-fno-defer-pop" if /gcc/ =~ CONFIG['CC'] +case PLATFORM +when /cygwin32/,/mingw32/ + $CFLAGS = "-fno-defer-pop" + create_makefile("Win32API") +when /win32/ create_makefile("Win32API") end diff --git a/ext/extmk.rb.nt b/ext/extmk.rb.nt index 6792f2717b..5836e5c681 100644 --- a/ext/extmk.rb.nt +++ b/ext/extmk.rb.nt @@ -1,5 +1,7 @@ #! /usr/local/bin/ruby +$".push 'mkmf.rb' #" + if ARGV[0] == 'static' $force_static = TRUE ARGV.shift @@ -379,7 +381,7 @@ def extmake(target) end end if $static - #$extlibs = " " + $extlibs = " " $extlibs += " " + $LDFLAGS if $LDFLAGS $extlibs += " " + $local_libs if $local_libs $extlibs += " " + $libs if $libs @@ -438,6 +440,8 @@ if $cache_mod end exit if $install or $clean +$extinit = " " unless $extinit +$extobjs = "" if $extlist.size > 0 for s,t in $extlist #for s,t in $static_ext diff --git a/ext/socket/depend b/ext/socket/depend index 3d54fa073c..6e8c3b7d97 100644 --- a/ext/socket/depend +++ b/ext/socket/depend @@ -1 +1 @@ -socket.o : socket.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h $(hdrdir)/io.h $(hdrdir)/sig.h +socket.o : socket.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h $(hdrdir)/rubyio.h $(hdrdir)/rubysig.h diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c index e144c5f082..7d2abb8e80 100644 --- a/ext/tcltklib/tcltklib.c +++ b/ext/tcltklib/tcltklib.c @@ -120,8 +120,9 @@ ip_ruby(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[]) res = rb_rescue(rb_eval_string, (VALUE)argv[1], ip_eval_rescue, (VALUE)&failed); trap_immediate = old_trapflg; + Tcl_ResetResult(interp); if (failed) { - Tcl_AppendResult(interp, RSTRING(failed)->ptr, (char*)NULL); + Tcl_AppendResult(interp, STR2CSTR(failed), (char*)NULL); return TCL_ERROR; } @@ -130,12 +131,11 @@ ip_ruby(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[]) DUMP1("(rb_eval_string result) nil"); return TCL_OK; } - Check_Type(res, T_STRING); /* copy result to the tcl interpreter */ - DUMP2("(rb_eval_string result) %s", RSTRING(res)->ptr); + DUMP2("(rb_eval_string result) %s", STR2CSTR(res)); DUMP1("Tcl_AppendResult"); - Tcl_AppendResult(interp, RSTRING(res)->ptr, (char *)NULL); + Tcl_AppendResult(interp, STR2CSTR(res), (char *)NULL); return TCL_OK; } diff --git a/ext/tkutil/tkutil.c b/ext/tkutil/tkutil.c index 540995eb82..58a382a41b 100644 --- a/ext/tkutil/tkutil.c +++ b/ext/tkutil/tkutil.c @@ -18,8 +18,7 @@ tk_eval_cmd(argc, argv) VALUE cmd, rest; rb_scan_args(argc, argv, "1*", &cmd, &rest); - rb_eval_cmd(cmd, rest); - return Qnil; + return rb_eval_cmd(cmd, rest); } static VALUE |