merges r23556 from trunk into ruby_1_9_1.

--
* error.c (syserr_initialize): errno is int.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3c0e53aaa..ee6d14af5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 24 22:39:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (syserr_initialize): errno is int.
+
 Sat May 23 18:53:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/dl/lib/dl/cparser.rb (DL::CParser#parse_struct_signature):
diff --git a/error.c b/error.c
index df4b0cc67..77ff2b4c1 100644
--- a/error.c
+++ b/error.c
@@ -947,7 +947,7 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
 	rb_scan_args(argc, argv, "01", &mesg);
 	error = rb_const_get(klass, rb_intern("Errno"));
     }
-    if (!NIL_P(error)) err = strerror(NUM2LONG(error));
+    if (!NIL_P(error)) err = strerror(NUM2INT(error));
     else err = "unknown error";
     if (!NIL_P(mesg)) {
 	VALUE str = mesg;
diff --git a/version.h b/version.h
index 6744ee235..b13ede70c 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 156
+#define RUBY_PATCHLEVEL 157
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1