aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--vsnprintf.c18
2 files changed, 23 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 152613bee8..9b04d5f68f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 24 12:47:16 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * vsnprintf (BSD_vfprintf): added VC++ compatible size specifications
+ (I, I32, I64).
+
Wed Nov 24 11:19:13 2010 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (rb_str_inspect): treat UTF-16 and UTF-32 as BE or LE.
diff --git a/vsnprintf.c b/vsnprintf.c
index 6778b90d8f..a68b0d05dc 100644
--- a/vsnprintf.c
+++ b/vsnprintf.c
@@ -758,6 +758,24 @@ reswitch: switch (ch) {
flags |= QUADINT;
goto rflag;
#endif /* _HAVE_SANE_QUAD_ */
+#if _WIN32
+ case 'I':
+ if (*fmt == '3' && *(fmt + 1) == '2') {
+ fmt += 2;
+ flags |= LONGINT;
+ }
+ else if (*fmt == '6' && *(fmt + 1) == '4') {
+ fmt += 2;
+ flags |= QUADINT;
+ }
+ else
+#if SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+ flags |= QUADINT;
+#else
+ flags |= LONGINT;
+#endif
+ goto rflag;
+#endif
case 'c':
cp = buf;
*buf = (char)va_arg(ap, int);