summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--include/ruby/missing.h6
-rw-r--r--sprintf.c6
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index a00528890a2..278cb73878a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 2 23:33:38 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * include/ruby/missing.h, sprintf.c: get rid of a warning of VC++.
+
Fri Jan 2 22:25:46 2009 Yusuke Endoh <mame@tsg.ne.jp>
* process.c: use sigaction instead of sigset. [ruby-core:21021]
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index ea40f62a523..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
+# 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
diff --git a/sprintf.c b/sprintf.c
index 83560def997..aebb9d5e66d 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -1084,13 +1084,7 @@ fmt_setup(char *buf, size_t size, int c, int flags, int width, int prec)
#undef snprintf
#define FLOATING_POINT 1
#define BSD__dtoa ruby_dtoa
-#if _MSC_VER >= 1300
-#pragma warning(disable: 4273)
-#endif
#include "missing/vsnprintf.c"
-#if _MSC_VER >= 1300
-#pragma warning(default: 4273)
-#endif
static int
ruby__sfvwrite(register rb_printf_buffer *fp, register struct __suio *uio)