diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-10-23 08:59:42 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-10-23 08:59:42 +0000 |
commit | d74e7e6837c92e33eeff2fdbdca8833c973dbd21 (patch) | |
tree | 9a0c26f214ec94e2c58c6b058edcf37afe13b93f | |
parent | 443ddb09699926f74798fdb8440a24ebda358088 (diff) | |
download | ruby-d74e7e6837c92e33eeff2fdbdca8833c973dbd21.tar.gz |
* eval.c (ruby_cleanup): initialize stack bottom for embedding.
[ruby-dev:21686]
* ext/dl/extconf.rb: move list of files to clean from DEPEND file,
to get rid of macro redefinitions.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | eval.c | 3 | ||||
-rw-r--r-- | ext/dl/depend | 3 | ||||
-rw-r--r-- | ext/dl/extconf.rb | 3 |
4 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Thu Oct 23 17:59:36 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (ruby_cleanup): initialize stack bottom for embedding. + [ruby-dev:21686] + + * ext/dl/extconf.rb: move list of files to clean from DEPEND file, + to get rid of macro redefinitions. + Thu Oct 23 13:44:00 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y: integrate operations for stack_type. [ruby-dev:21681] @@ -1301,7 +1301,7 @@ ruby_options(argc, argv) if ((state = EXEC_TAG()) == 0) { ruby_process_options(argc, argv); } - if (state) { + else { trace_func = 0; tracing = 0; exit(error_handle(state)); @@ -1347,6 +1347,7 @@ ruby_cleanup(ex) volatile VALUE err = ruby_errinfo; ruby_safe_level = 0; + Init_stack((void*)&state); ruby_finalize_0(); if (ruby_errinfo) err = ruby_errinfo; PUSH_TAG(PROT_NONE); diff --git a/ext/dl/depend b/ext/dl/depend index 3d62fe3421..fba3df7a3d 100644 --- a/ext/dl/depend +++ b/ext/dl/depend @@ -1,6 +1,3 @@ -CLEANFILES = test/test.o -DISTCLEANFILES = call.func callback.func cbtable.func dlconfig.rb dlconfig.h \ - test/libtest.so test/*~ *~ mkmf.log LDSHARED_TEST = $(LDSHARED) $(LDFLAGS) test/test.o -o test/libtest.so $(LOCAL_LIBS) libtest.so: test/libtest.so diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb index bd92313b7e..e712134448 100644 --- a/ext/dl/extconf.rb +++ b/ext/dl/extconf.rb @@ -177,6 +177,9 @@ $INSTALLFILES = [ ["./dlconfig.h", "$(archdir)$(target_prefix)", "."], ["dl.h", "$(archdir)$(target_prefix)", ""], ] +$cleanfiles = %w[test/test.o] +$distcleanfiles = %w[call.func callback.func cbtable.func dlconfig.rb +./dlconfig.h test/libtest.so test/*~ *~ mkmf.log] create_makefile('dl') rescue SystemExit |