diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 06:18:43 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 06:18:43 +0000 |
commit | 99606f89c04d0156e8149329d39e9b2ab4754549 (patch) | |
tree | 252dff486225ff2c90756cb9700b13c3f8dd987d | |
parent | 7329f4e92c90709fe57115f16a8ac9784a51b509 (diff) | |
download | ruby-99606f89c04d0156e8149329d39e9b2ab4754549.tar.gz |
* vsnprintf (BSD_vfprintf): use QUADINT macro only when _HAVE_SANE_QUAD_
macro is defined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | vsnprintf.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Nov 24 15:18:07 2010 NAKAMURA Usaku <usa@ruby-lang.org> + + * vsnprintf (BSD_vfprintf): use QUADINT macro only when _HAVE_SANE_QUAD_ + macro is defined. + Wed Nov 24 12:47:16 2010 NAKAMURA Usaku <usa@ruby-lang.org> * vsnprintf (BSD_vfprintf): added VC++ compatible size specifications diff --git a/vsnprintf.c b/vsnprintf.c index a68b0d05dc..196e733985 100644 --- a/vsnprintf.c +++ b/vsnprintf.c @@ -764,12 +764,14 @@ reswitch: switch (ch) { fmt += 2; flags |= LONGINT; } +#ifdef _HAVE_SANE_QUAD_ else if (*fmt == '6' && *(fmt + 1) == '4') { fmt += 2; flags |= QUADINT; } +#endif else -#if SIZEOF_SIZE_T == SIZEOF_LONG_LONG +#if defined(_HAVE_SANE_QUAD_) && SIZEOF_SIZE_T == SIZEOF_LONG_LONG flags |= QUADINT; #else flags |= LONGINT; |