ruby · xaviershay · May 12, 2011 · May 12, 2011 · May 12, 2011 · May 12, 2011
diff --git a/.gitignore b/.gitignore
@@ -129,3 +129,4 @@ y.tab.c
 
 # /win32/
 /win32/*.ico
+ext/win32ole/.document
diff --git a/array.c b/array.c
@@ -305,7 +305,7 @@ ary_alloc(VALUE klass)
     return (VALUE)ary;
 }
 
-static VALUE
+VALUE
 ary_new(VALUE klass, long capa)
 {
     VALUE ary;

diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
@@ -3,10 +3,8 @@
 dir = File.expand_path("../..", __FILE__)
 $:.unshift(dir)
 $:.unshift(".")
-if $".grep(/mkmf/).empty?
-  $" << "mkmf.rb"
-  load File.expand_path("lib/mkmf.rb", dir)
-end
+$:.unshift(dir + '/lib')
+require 'mkmf'
 require 'erb'
 
 CONFIG["MAKEDIRS"] ||= '$(MINIRUBY) -run -e mkdir -- -p'

diff --git a/enumerator.c b/enumerator.c
@@ -1171,6 +1171,4 @@ Init_Enumerator(void)
     id_rewind = rb_intern("rewind");
     id_each = rb_intern("each");
     sym_each = ID2SYM(id_each);
-
-    rb_provide("enumerator.so");	/* for backward compatibility */
 }
diff --git a/ext/extmk.rb b/ext/extmk.rb
@@ -36,8 +36,8 @@
 $topdir = "."
 $top_srcdir = srcdir
 
-$" << "mkmf.rb"
-load File.expand_path("lib/mkmf.rb", srcdir)
+$:.unshift(srcdir + '/lib')
+require 'mkmf'
 require 'optparse/shellwords'
 
 def sysquote(x)

diff --git a/file.c b/file.c
@@ -1270,7 +1270,7 @@ rb_file_chardev_p(VALUE obj, VALUE fname)
  * Return <code>true</code> if the named file exists.
  */
 
-static VALUE
+VALUE
 rb_file_exist_p(VALUE obj, VALUE fname)
 {
     struct stat st;

diff --git a/lib/enumerator.rb b/lib/enumerator.rb
@@ -0,0 +1,3 @@
+# This class is now defined entirely in enumerator.c and is always available.
+# This file needs to remain here for backwards compatibility, so that `require
+# "enumerator"` will not raise an exception.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -129,3 +129,4 @@ y.tab.c

		# /win32/
		/win32/*.ico
		ext/win32ole/.document