mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-13 10:52:56 +01:00
Win32 build fixes
This commit is contained in:
parent
352da8ae87
commit
26b0aea24f
@ -198,10 +198,10 @@ case "${host_os}" in
|
||||
AC_CHECK_HEADERS(windows.h)
|
||||
AC_CHECK_LIB(ws2_32, main, ,
|
||||
[AC_MSG_ERROR([cannot link with ws2_32.dll.])])
|
||||
AC_CHECK_LIB(Rpcrt4, main, ,
|
||||
[AC_MSG_ERROR([cannot link with Rpcrt4.dll.])])
|
||||
AC_CHECK_LIB(Iphlpapi, main, ,
|
||||
[AC_MSG_ERROR([cannot link with Iphlpapi.dll.])])
|
||||
AC_CHECK_LIB(rpcrt4, main, ,
|
||||
[AC_MSG_ERROR([cannot link with rpcrt4.dll.])])
|
||||
AC_CHECK_LIB(iphlpapi, main, ,
|
||||
[AC_MSG_ERROR([cannot link with iphlpapi.dll.])])
|
||||
CFLAGS="${CFLAGS} -std=c99"
|
||||
on_mingw32="yes"
|
||||
install_man="no"
|
||||
|
@ -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
|
||||
|
||||
|
10
src/ip.hpp
10
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
|
||||
{
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user