diff options
| author | Mikko Koppanen <mkoppanen@php.net> | 2010-11-17 15:05:01 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-11-17 15:05:01 +0100 |
| commit | 3dbd5d58723bdc31eb00a6ebf4f643059a432f8c (patch) | |
| tree | 8dd90c8f8d00f44e3c53af97e3ca2315202b4b2b | |
| parent | 34f50a6840fdf638bbd7887aa2438006baeb884d (diff) | |
Fix mingw32 build
MinGW32 defines __int64_t as long long, which causes the build to fail
unless -Wno-long-long is used. In addition the shutdown_stress test
isn't currently compatible with Win.
Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 76a0ec6..700a9d1 100644 --- a/configure.in +++ b/configure.in @@ -191,7 +191,8 @@ case "${host_os}" in [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" + # mingw32 defines __int64_t as long long + CPPFLAGS="-Wno-long-long ${CPPFLAGS} " on_mingw32="yes" ;; *cygwin*) diff --git a/tests/Makefile.am b/tests/Makefile.am index e580802..bdc55d2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,8 +6,11 @@ noinst_PROGRAMS = test_pair_inproc \ test_pair_tcp \ test_reqrep_inproc \ test_reqrep_ipc \ - test_reqrep_tcp \ - test_shutdown_stress + test_reqrep_tcp + +if !ON_MINGW +noinst_PROGRAMS += test_shutdown_stress +endif test_pair_inproc_SOURCES = test_pair_inproc.cpp testutil.hpp test_pair_ipc_SOURCES = test_pair_ipc.cpp testutil.hpp @@ -17,6 +20,8 @@ test_reqrep_inproc_SOURCES = test_reqrep_inproc.cpp testutil.hpp test_reqrep_ipc_SOURCES = test_reqrep_ipc.cpp testutil.hpp test_reqrep_tcp_SOURCES = test_reqrep_tcp.cpp testutil.hpp +if !ON_MINGW test_shutdown_stress_SOURCES = test_shutdown_stress.cpp +endif TESTS = $(noinst_PROGRAMS) |