3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 07:16:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverting previous commit that broke MSVC2010 build

Browse Source 
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik 2011-06-13 07:53:22 +02:00
parent b164023cca
commit c7fb5c54b6
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ctx.cpp
View File

@ -31,13 +31,9 @@
#include "msg.hpp" #include "msg.hpp"
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
#ifndef WIN32_LEAN_AND_MEAN #include "windows.h"
#define WIN32_LEAN_AND_MEAN
#endif
#include <winsock2.h>
#include <windows.h>
#else #else
#include <unistd.h> #include "unistd.h"
#endif #endif
zmq::ctx_t::ctx_t (uint32_t io_threads_) : zmq::ctx_t::ctx_t (uint32_t io_threads_) :

2
src/select.cpp
View File

@ -24,7 +24,7 @@
#include <algorithm> #include <algorithm>
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
#include <winsock2.h> #include "winsock2.h"
#elif defined ZMQ_HAVE_HPUX #elif defined ZMQ_HAVE_HPUX
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h> #include <sys/types.h>

2
src/select.hpp
View File

@ -27,7 +27,7 @@
#include <vector> #include <vector>
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
#include <winsock2.h> #include "winsock2.h"
#elif defined ZMQ_HAVE_OPENVMS #elif defined ZMQ_HAVE_OPENVMS
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>

5
src/windows.hpp
View File

@ -24,6 +24,7 @@
// The purpose of this header file is to turn on only the items actually needed // The purpose of this header file is to turn on only the items actually needed
// on the windows platform. // on the windows platform.
#define _WINSOCKAPI_
#ifndef NOMINMAX #ifndef NOMINMAX
#define NOMINMAX // No min and max functions, these clash with C++. #define NOMINMAX // No min and max functions, these clash with C++.
#endif #endif
@ -49,10 +50,11 @@
#ifdef WINVER #ifdef WINVER
#undef WINVER #undef WINVER
#endif #endif
// Default to Windows Server 2003, Windows XP
#define WINVER 0x0501 #define WINVER 0x0501
#endif #endif
#include <windows.h>
// MSVC++ 2005 on Win2000 does not define _WIN32_WINNT. // MSVC++ 2005 on Win2000 does not define _WIN32_WINNT.
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#define _WIN32_WINNT WINVER #define _WIN32_WINNT WINVER
@ -66,7 +68,6 @@
#include <winsock.h> #include <winsock.h>
#endif #endif
#include <windows.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <ipexport.h> #include <ipexport.h>
#include <process.h> #include <process.h>