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

3 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 01f65117dc..9c38c0d5f7 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 77437d6ffa..39c47d336e 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 76902d9a6d..a95bddbf68 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);