diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:07:08 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:07:08 +0000 |
| commit | 0d7d1bb5daae0b1de0b6a896b121fe970c6f0eaa (patch) | |
| tree | 0a77e83e1d7fe2c78b986e9e079c410a00474ae2 | |
| parent | d589c29331c5b1d6896e6bdb03eed879e34c1c74 (diff) | |
merges r29466 from trunk into ruby_1_9_2.
--
* 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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | vsnprintf.c | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -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> * io.c (rb_io_ungetc): always see Bignum. On 32bit valid value @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 72 +#define RUBY_PATCHLEVEL 73 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 diff --git a/vsnprintf.c b/vsnprintf.c index 26e2082f12..a1ac4424a2 100644 --- a/vsnprintf.c +++ b/vsnprintf.c @@ -893,7 +893,7 @@ fp_begin: _double = va_arg(ap, double); */ prec = (int)(sizeof(void*)*CHAR_BIT/4); #ifdef _HAVE_LLP64_ - uqval = (u_long)va_arg(ap, void *); + uqval = (u_quad_t)va_arg(ap, void *); flags = (flags) | QUADINT | HEXPREFIX; #else ulval = (u_long)va_arg(ap, void *); |