merges r25134 from trunk into ruby_1_9_1.

--
* dln.c (aix_loaderror): needs format string.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-11-27 02:55:49 +00:00
parent f1d6d2da33
commit 28e26e7f65
3 changed files with 6 additions and 2 deletions

View file

@ -1,3 +1,7 @@
Mon Sep 28 22:33:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dln.c (aix_loaderror): needs format string.
Mon Sep 28 10:06:38 2009 NARUSE, Yui <naruse@ruby-lang.org>
* stringio/stringio.c (strio_read): set ASCII-8BIT encoding

2
dln.c
View file

@ -1196,7 +1196,7 @@ aix_loaderror(const char *pathname)
ERRBUF_APPEND("\n");
}
errbuf[strlen(errbuf)-1] = '\0'; /* trim off last newline */
rb_loaderror(errbuf);
rb_loaderror("%s", errbuf);
return;
}
#endif

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 354
#define RUBY_PATCHLEVEL 355
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1