diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-21 10:51:14 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-21 10:51:14 +0000 |
| commit | 6f869a57feddab587f32b0bfa1908af9c3a10c9c (patch) | |
| tree | 666e31055f564661909ec15112b5017e198a08be | |
| parent | c0c20ccb519071802e82341f0bb584c9d833b3de (diff) | |
| download | ruby-6f869a57feddab587f32b0bfa1908af9c3a10c9c.tar.gz | |
ruby/win32.h: include windows.h
* include/ruby/win32.h: include windows.h before winsock2.h,
because mswsock.h included by the former uses SOCKET defined
after it in the latter. fix a build failure with VC6.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/socket/getaddrinfo.c | 3 | ||||
| -rw-r--r-- | ext/socket/getnameinfo.c | 3 | ||||
| -rw-r--r-- | include/ruby/win32.h | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c index 68f610e807..6d6d11fa8f 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -66,6 +66,9 @@ #endif #include <unistd.h> #else +#if defined(_MSC_VER) && _MSC_VER <= 1200 +#include <windows.h> +#endif #include <winsock2.h> #include <ws2tcpip.h> #include <io.h> diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c index 4da9680ccb..d54a7c8c0d 100644 --- a/ext/socket/getnameinfo.c +++ b/ext/socket/getnameinfo.c @@ -59,6 +59,9 @@ #endif #endif #ifdef _WIN32 +#if defined(_MSC_VER) && _MSC_VER <= 1200 +#include <windows.h> +#endif #include <winsock2.h> #include <ws2tcpip.h> #define snprintf _snprintf diff --git a/include/ruby/win32.h b/include/ruby/win32.h index 9daea06323..7bf389d8e1 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -35,6 +35,9 @@ extern "C++" { /* template without extern "C++" */ #if !defined(_WIN64) && !defined(WIN32) #define WIN32 #endif +#if defined(_MSC_VER) && _MSC_VER <= 1200 +#include <windows.h> +#endif #include <winsock2.h> #include <ws2tcpip.h> #if !defined(_MSC_VER) || _MSC_VER >= 1400 |