mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
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:
parent
f1d6d2da33
commit
28e26e7f65
3 changed files with 6 additions and 2 deletions
|
@ -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>
|
Mon Sep 28 10:06:38 2009 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
* stringio/stringio.c (strio_read): set ASCII-8BIT encoding
|
* stringio/stringio.c (strio_read): set ASCII-8BIT encoding
|
||||||
|
|
2
dln.c
2
dln.c
|
@ -1196,7 +1196,7 @@ aix_loaderror(const char *pathname)
|
||||||
ERRBUF_APPEND("\n");
|
ERRBUF_APPEND("\n");
|
||||||
}
|
}
|
||||||
errbuf[strlen(errbuf)-1] = '\0'; /* trim off last newline */
|
errbuf[strlen(errbuf)-1] = '\0'; /* trim off last newline */
|
||||||
rb_loaderror(errbuf);
|
rb_loaderror("%s", errbuf);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#define RUBY_VERSION "1.9.1"
|
#define RUBY_VERSION "1.9.1"
|
||||||
#define RUBY_PATCHLEVEL 354
|
#define RUBY_PATCHLEVEL 355
|
||||||
#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
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue