archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merges r29466 from trunk into ruby_1_9_2.

Browse source 
--
* vsnprintf.c (BSD_vfprintf): fix cast.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-12-02 08:07:08 +00:00
parent d589c29331
commit 0d7d1bb5da
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Oct 12 23:55:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vsnprintf.c (BSD_vfprintf): fix cast.
Tue Oct 12 18:25:43 2010 NARUSE, Yui <naruse@ruby-lang.org> Tue Oct 12 18:25:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (rb_io_ungetc): always see Bignum. On 32bit valid value * io.c (rb_io_ungetc): always see Bignum. On 32bit valid value

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 72 #define RUBY_PATCHLEVEL 73
#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

2
vsnprintf.c
View file

@ -893,7 +893,7 @@ fp_begin: _double = va_arg(ap, double);
*/ */
prec = (int)(sizeof(void*)*CHAR_BIT/4); prec = (int)(sizeof(void*)*CHAR_BIT/4);
#ifdef _HAVE_LLP64_ #ifdef _HAVE_LLP64_
uqval = (u_long)va_arg(ap, void *); uqval = (u_quad_t)va_arg(ap, void *);
flags = (flags) | QUADINT | HEXPREFIX; flags = (flags) | QUADINT | HEXPREFIX;
#else #else
ulval = (u_long)va_arg(ap, void *); ulval = (u_long)va_arg(ap, void *);