From be41ba3bedef74d484bb25ce263a9ca71a8e0855 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
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/win32.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'include/ruby/win32.h')

diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index a7d07083a..7c0da1f49 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -27,8 +27,14 @@ extern "C" {
 
 // #include <stdarg.h> conflict with varargs.h?
 #if !defined(WSAAPI)
+#if defined(__cplusplus) && defined(_MSC_VER)
+extern "C++" {			/* template without extern "C++" */
+#endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#if defined(__cplusplus) && defined(_MSC_VER)
+}
+#endif
 #endif
 
 #define NT 1			/* deprecated */
-- 
cgit