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 | 89688592d9374f0a011af208ad98a8441445c42d (patch) | |
| tree | ffbe1076f414571ca5fbefbb6cd7d9a57a167bc4 | |
| parent | 5f45b88173339ff7fdf6015c4868b315ef4978a9 (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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | include/ruby/missing.h | 6 | ||||
| -rw-r--r-- | sprintf.c | 6 |
3 files changed, 10 insertions, 6 deletions
@@ -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 10:20:24 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/singleton.rb: fix documentation. [ruby-core:21038] diff --git a/include/ruby/missing.h b/include/ruby/missing.h index ea40f62a5..d553f1c73 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 @@ -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) |