diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-06-04 16:29:36 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-06-04 16:29:36 +0200 |
| commit | cf048bb1f8a665370d9e39aee2a7363327911b08 (patch) | |
| tree | bd5af3e844051771646596a6d13d847bf2ea8f85 /src | |
| parent | 927993863eda325c66fc678810eeadd0c744cdf2 (diff) | |
platform.hpp for MSVC contains only very basic stuff
Diffstat (limited to 'src')
| -rw-r--r-- | src/encoder.hpp | 5 | ||||
| -rw-r--r-- | src/prefix_tree.cpp | 5 | ||||
| -rw-r--r-- | src/uuid.cpp | 1 | ||||
| -rw-r--r-- | src/uuid.hpp | 1 | ||||
| -rw-r--r-- | src/windows.hpp | 4 | ||||
| -rw-r--r-- | src/zmq_engine.cpp | 6 |
6 files changed, 20 insertions, 2 deletions
diff --git a/src/encoder.hpp b/src/encoder.hpp index bd62298..10fe912 100644 --- a/src/encoder.hpp +++ b/src/encoder.hpp @@ -20,6 +20,11 @@ #ifndef __ZMQ_ENCODER_HPP_INCLUDED__ #define __ZMQ_ENCODER_HPP_INCLUDED__ +#include "platform.hpp" +#if defined ZMQ_HAVE_WINDOWS +#include "windows.hpp" +#endif + #include <stddef.h> #include <string.h> #include <stdlib.h> diff --git a/src/prefix_tree.cpp b/src/prefix_tree.cpp index 441f85d..51225d6 100644 --- a/src/prefix_tree.cpp +++ b/src/prefix_tree.cpp @@ -22,6 +22,11 @@ #include <new> #include <algorithm> +#include "platform.hpp" +#if defined ZMQ_HAVE_WINDOWS +#include "windows.hpp" +#endif + #include "err.hpp" #include "prefix_tree.hpp" diff --git a/src/uuid.cpp b/src/uuid.cpp index 631a625..406bbb4 100644 --- a/src/uuid.cpp +++ b/src/uuid.cpp @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "platform.hpp" #include "uuid.hpp" #include "err.hpp" diff --git a/src/uuid.hpp b/src/uuid.hpp index da365ae..871f827 100644 --- a/src/uuid.hpp +++ b/src/uuid.hpp @@ -29,6 +29,7 @@ defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_CYGWIN #include <uuid/uuid.h> #elif defined ZMQ_HAVE_WINDOWS +#include "windows.hpp" #include <rpc.h> #elif defined ZMQ_HAVE_OPENVMS typedef struct diff --git a/src/windows.hpp b/src/windows.hpp index 81c4d38..35024ba 100644 --- a/src/windows.hpp +++ b/src/windows.hpp @@ -23,6 +23,10 @@ // The purpose of this header file is to turn on only the items actually needed // on the windows platform. +#define _WINSOCKAPI_ +#define NOMINMAX +#define _CRT_SECURE_NO_WARNINGS + #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif diff --git a/src/zmq_engine.cpp b/src/zmq_engine.cpp index 8990b48..41b10c8 100644 --- a/src/zmq_engine.cpp +++ b/src/zmq_engine.cpp @@ -17,8 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <string.h> +#include "platform.hpp" +#if defined ZMQ_HAVE_WINDOWS +#include "windows.hpp" +#endif +#include <string.h> #include <new> #include "zmq_engine.hpp" |