summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--eval.c3
-rw-r--r--ext/dl/depend3
-rw-r--r--ext/dl/extconf.rb3
4 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c785a4cd46e..e76ec5acbba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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]
diff --git a/eval.c b/eval.c
index 483beea2db4..5961e1ec622 100644
--- a/eval.c
+++ b/eval.c
@@ -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 3d62fe3421b..fba3df7a3d1 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 bd92313b7e8..e7121344481 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