summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/missing.h8
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 414a1e01e13..28c713c6274 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 24 18:58:56 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * include/ruby/missing.h (vsnprintf): rollback a part of r24179, because
+ it's meaningless.
+
Mon Aug 24 16:35:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* st.c (st_delete_safe): deals with packed entries.
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index 61524d2db1a..d553f1c738e 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -151,7 +151,13 @@ RUBY_EXTERN long strtol(const char *, char **, int);
RUBY_EXTERN int snprintf(char *, size_t n, char const *, ...);
#endif
#ifndef HAVE_VSNPRINTF
-extern int vsnprintf(char *, size_t n, char const *, va_list);
+# if _MSC_VER >= 1300
+# pragma warning(disable: 4273)
+# endif
+RUBY_EXTERN int vsnprintf(char *, size_t n, char const *, va_list);
+# if _MSC_VER >= 1300
+# pragma warning(default: 4273)
+# endif
#endif
#ifndef HAVE_STRLCPY