* array.c (rb_ary_sort_bang): returns self, even if its length is

  less than 2.

* eval.c (POP_VARS): propagate DVAR_DONT_RECYCLE, if
  SCOPE_DONT_RECYCLE of ruby_scope is set.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 4 deletions

diff --git a/io.c b/io.c
index e0feee93dc..061e466fbc 100644
--- a/io.c
+++ b/io.c
@@ -1325,18 +1325,18 @@ rb_io_flags_mode(flags)
 }
 
 static int
-rb_sysopen(fname, flag, mode)
+rb_sysopen(fname, flags, mode)
     char *fname;
-    int flag;
+    int flags;
     unsigned int mode;
 {
     int fd;
 
-    fd = open(fname, flag, mode);
+    fd = open(fname, flags, mode);
     if (fd < 0) {
 	if (errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
-	    fd = open(fname, flag, mode);
+	    fd = open(fname, flags, mode);
 	}
 	if (fd < 0) {
 	    rb_sys_fail(fname);