From be41ba3bedef74d484bb25ce263a9ca71a8e0855 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 17 Jul 2009 21:33:05 +0000 Subject: * include/ruby/win32.h: include winsock headers in extern "C++" for C++ extension libraries. * include/ruby/missing.h (vsnprintf): workaround for VC++. [ruby-core:23096] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/missing.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'include/ruby/missing.h') diff --git a/include/ruby/missing.h b/include/ruby/missing.h index d553f1c73..61524d2db 100644 --- a/include/ruby/missing.h +++ b/include/ruby/missing.h @@ -151,13 +151,7 @@ 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 +extern int vsnprintf(char *, size_t n, char const *, va_list); #endif #ifndef HAVE_STRLCPY -- cgit