[zeromq-dev] Patch to build on windows

[Pavol Malosek]

Hello Dhruva,

I have applied your last patch, please give it a try with MSVC 2005, Linux
build is ok.

Thanks.

malo

----- Original Message -----
From: "dhruva" <dhruva at ymail.com>
To: "Pavol Malosek" <malosek at fastmq.com>; "ZeroMQ"
<zeromq-dev at lists.zeromq.org>
Sent: Monday, August 03, 2009 12:40 PM
Subject: Re: [zeromq-dev] Patch to build on windows


This is a final patch before I start exploring other areas, this fixes the
unix build error caused by my previous patch (see below) and also eliminates
the last warning message on windows build.

diff --git a/libzmq/api_thread.cpp b/libzmq/api_thread.cpp
index fdf8171..750157b 100644
--- a/libzmq/api_thread.cpp
+++ b/libzmq/api_thread.cpp
@@ -20,8 +20,7 @@
 #include <zmq/api_thread.hpp>
 #include <zmq/config.hpp>

-#ifdef _MSC_VER
-#include <stdio.h>
+#if defined(_MSC_VER) && defined(ZMQ_HAVE_RDTSC_IN_API_THREAD)
 #include <intrin.h>
 #pragma intrinsic(__rdtsc)
 #endif
diff --git a/libzmq/zmq/platform.hpp.cmake b/libzmq/zmq/platform.hpp.cmake
index 63ab4a9..3405212 100644
--- a/libzmq/zmq/platform.hpp.cmake
+++ b/libzmq/zmq/platform.hpp.cmake
@@ -25,8 +25,10 @@
 #define _WINSOCKAPI_
 #define NOMINMAX
 #define _CRT_SECURE_NO_WARNINGS
+#ifndef ZMQ_EXPORT
 #define ZMQ_EXPORT __declspec(dllexport)
 #endif
+#endif


-dhruva


----- Original Message ----
> From: dhruva <dhruva at ymail.com>
> To: Pavol Malosek <malosek at fastmq.com>; ZeroMQ
<zeromq-dev at lists.zeromq.org>
> Sent: Monday, 3 August, 2009 3:41:52 PM
> Subject: Re: [zeromq-dev] Patch to build on windows
>
> Hello,
> The name is correct, thank you. A small fix over the previous patch which
makes
> it correct:
>