From 9096abd36a13bcabe0dc6ad344f01a189c6c3293 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 24 Aug 2009 10:00:18 +0000 Subject: * include/ruby/missing.h (vsnprintf): rollback a part of r24179, because it's meaningless. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ include/ruby/missing.h | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 414a1e01e1..28c713c627 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 24 18:58:56 2009 NAKAMURA Usaku + + * include/ruby/missing.h (vsnprintf): rollback a part of r24179, because + it's meaningless. + Mon Aug 24 16:35:57 2009 Nobuyoshi Nakada * st.c (st_delete_safe): deals with packed entries. diff --git a/include/ruby/missing.h b/include/ruby/missing.h index 61524d2db1..d553f1c738 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 -- cgit v1.2.3