merges r23556 from trunk into ruby_1_9_1.

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-06-20 09:06:20 +00:00
parent a1bfd01aee
commit 7340277cfb
3 changed files with 6 additions and 2 deletions

View file

@ -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> Sat May 23 18:53:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/dl/lib/dl/cparser.rb (DL::CParser#parse_struct_signature): * ext/dl/lib/dl/cparser.rb (DL::CParser#parse_struct_signature):

View file

@ -947,7 +947,7 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
rb_scan_args(argc, argv, "01", &mesg); rb_scan_args(argc, argv, "01", &mesg);
error = rb_const_get(klass, rb_intern("Errno")); 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"; else err = "unknown error";
if (!NIL_P(mesg)) { if (!NIL_P(mesg)) {
VALUE str = mesg; VALUE str = mesg;

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-05-22" #define RUBY_RELEASE_DATE "2009-05-22"
#define RUBY_PATCHLEVEL 156 #define RUBY_PATCHLEVEL 157
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1