summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-27 12:51:26 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-27 12:51:26 +0000
commit0cf5edb9f754ccbb63c7a5d8022a6cfff1e7fa1b (patch)
tree5484592050ce9578921649042514fe4b2a416d90
parent9369118f8f4ed02c76839c6a67c268a2de9acde9 (diff)
Merge changes between r11907 and r11913 from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@11914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--configure.in1
-rw-r--r--util.c2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 01f6511..9c38c0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 27 21:50:10 2007 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * util.c (__crt0_glob_function): use ruby_glob() instead of rb_globi().
+
+ * configure.in (ac_cv_func_setrlimit): workaround for djgpp.
+
Tue Feb 27 20:49:19 2007 Akinori MUSHA <knu@iDaemons.org>
* lib/base64.rb (Base64::b64encode): Fix documentation; submitted
diff --git a/configure.in b/configure.in
index 77437d6..39c47d3 100644
--- a/configure.in
+++ b/configure.in
@@ -411,6 +411,7 @@ msdosdjgpp*) LIBS="-lm $LIBS"
ac_cv_func_getpgrp_void=yes
ac_cv_func_setitimer=no
ac_cv_sizeof_rlim_t=4
+ ac_cv_func_setrlimit=no
;;
bsdi*) LIBS="-lm $LIBS"
ac_cv_sizeof_rlim_t=8;;
diff --git a/util.c b/util.c
index 76902d9..a95bddb 100644
--- a/util.c
+++ b/util.c
@@ -358,7 +358,7 @@ __crt0_glob_function(char *path)
info.count = 0;
info.head = 0;
- rb_globi(buf, push_element, (VALUE)&info);
+ ruby_glob(buf, 0, push_element, (VALUE)&info);
if (buf != path_buffer)
ruby_xfree(buf);