generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-05-29 07:25:56 +02:00
Code Issues Projects Releases Wiki Activity

Win32 build fixes

Browse Source
This commit is contained in:
Martin Lucina 2010-03-03 17:01:08 +01:00
parent 352da8ae87
commit 26b0aea24f
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.in
View File

@ -198,10 +198,10 @@ case "${host_os}" in
AC_CHECK_HEADERS(windows.h) AC_CHECK_HEADERS(windows.h)
AC_CHECK_LIB(ws2_32, main, , AC_CHECK_LIB(ws2_32, main, ,
[AC_MSG_ERROR([cannot link with ws2_32.dll.])]) [AC_MSG_ERROR([cannot link with ws2_32.dll.])])
AC_CHECK_LIB(Rpcrt4, main, , AC_CHECK_LIB(rpcrt4, main, ,
[AC_MSG_ERROR([cannot link with Rpcrt4.dll.])]) [AC_MSG_ERROR([cannot link with rpcrt4.dll.])])
AC_CHECK_LIB(Iphlpapi, main, , AC_CHECK_LIB(iphlpapi, main, ,
[AC_MSG_ERROR([cannot link with Iphlpapi.dll.])]) [AC_MSG_ERROR([cannot link with iphlpapi.dll.])])
CFLAGS="${CFLAGS} -std=c99" CFLAGS="${CFLAGS} -std=c99"
on_mingw32="yes" on_mingw32="yes"
install_man="no" install_man="no"

4
src/Makefile.am
View File

@ -179,7 +179,11 @@ libzmq_la_SOURCES = app_thread.hpp \
zmq_init.cpp \ zmq_init.cpp \
zmq_listener.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@ libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
endif
if BUILD_PGM if BUILD_PGM

10
src/ip.hpp
View File

@ -30,6 +30,11 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.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_ // Some platforms (notably Darwin/OSX and NetBSD) do not define all AI_
// flags for getaddrinfo(). This can be worked around safely by defining // flags for getaddrinfo(). This can be worked around safely by defining
@ -40,11 +45,6 @@
#ifndef AI_NUMERICSERV #ifndef AI_NUMERICSERV
#define AI_NUMERICSERV 0 #define AI_NUMERICSERV 0
#endif #endif
#endif
#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
#include <sys/un.h>
#endif
namespace zmq namespace zmq
{ {

2
src/uuid.hpp
View File

@ -29,7 +29,7 @@
defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_CYGWIN defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_CYGWIN
#include <uuid/uuid.h> #include <uuid/uuid.h>
#elif defined ZMQ_HAVE_WINDOWS #elif defined ZMQ_HAVE_WINDOWS
#include <Rpc.h> #include <rpc.h>
#endif #endif
namespace zmq namespace zmq