From 28e26e7f658bce1d677564aa04fb89833ca02d12 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 27 Nov 2009 02:55:49 +0000 Subject: 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 --- ChangeLog | 4 ++++ dln.c | 2 +- version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4359e16fc..98c1a378cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Sep 28 22:33:11 2009 Nobuyoshi Nakada + + * dln.c (aix_loaderror): needs format string. + Mon Sep 28 10:06:38 2009 NARUSE, Yui * stringio/stringio.c (strio_read): set ASCII-8BIT encoding diff --git a/dln.c b/dln.c index 6849d28506..3607f018e3 100644 --- a/dln.c +++ b/dln.c @@ -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 diff --git a/version.h b/version.h index 8453c579a4..84d46cfbda 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3