diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 06:15:49 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 06:15:49 +0000 |
| commit | e7b1674161175351361da89dfce6a52f270a2b2f (patch) | |
| tree | ffbe1076f414571ca5fbefbb6cd7d9a57a167bc4 /include/ruby | |
| parent | e23b63126e9d8d93b1710de7c0061f089a466b20 (diff) | |
merges r21227 from trunk into ruby_1_9_1.
* include/ruby/missing.h, sprintf.c: get rid of a warning of VC++.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
| -rw-r--r-- | include/ruby/missing.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/ruby/missing.h b/include/ruby/missing.h index ea40f62a52..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 +# 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 |