summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Lucina <mato@kotelna.sk>2010-03-03 17:01:08 +0100
committerMartin Lucina <mato@kotelna.sk>2010-03-03 17:01:08 +0100
commit26b0aea24f9add0a1811e23f709d96b44b459571 (patch)
treeb1a121b5d272d5635aacfadbabf6ebc8fbe3dc9b /src
parent352da8ae8775f057a7ec67a7bd3f2270ac1c4d0f (diff)
Win32 build fixes
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/ip.hpp10
-rw-r--r--src/uuid.hpp2
3 files changed, 10 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 4146f68..eeb33d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -179,7 +179,11 @@ libzmq_la_SOURCES = app_thread.hpp \
zmq_init.cpp \
zmq_listener.cpp
+if ON_MINGW
+libzmq_la_LDFLAGS = -no-undefined -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
+else
libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
+endif
if BUILD_PGM
diff --git a/src/ip.hpp b/src/ip.hpp
index ffab2f2..d963df2 100644
--- a/src/ip.hpp
+++ b/src/ip.hpp
@@ -30,6 +30,11 @@
#include <arpa/inet.h>
#include <netinet/in.h>
#include <netdb.h>
+#endif
+
+#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
+#include <sys/un.h>
+#endif
// Some platforms (notably Darwin/OSX and NetBSD) do not define all AI_
// flags for getaddrinfo(). This can be worked around safely by defining
@@ -40,11 +45,6 @@
#ifndef AI_NUMERICSERV
#define AI_NUMERICSERV 0
#endif
-#endif
-
-#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
-#include <sys/un.h>
-#endif
namespace zmq
{
diff --git a/src/uuid.hpp b/src/uuid.hpp
index d24ef2c..a39bc99 100644
--- a/src/uuid.hpp
+++ b/src/uuid.hpp
@@ -29,7 +29,7 @@
defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_CYGWIN
#include <uuid/uuid.h>
#elif defined ZMQ_HAVE_WINDOWS
-#include <Rpc.h>
+#include <rpc.h>
#endif
namespace zmq