summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikko Koppanen <mkoppanen@php.net>2011-09-06 08:51:23 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-09-06 08:51:23 +0200
commite191e806ead4e8954e03612a4b385aff40871272 (patch)
tree24198994524843934ab5c010ab639515e6ef5209
parent9d0e122bfad431d7b84ad43c0c62c8ebc9540a36 (diff)
Fix polling system detection on mingw32 build
Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
-rw-r--r--acinclude.m410
1 files changed, 8 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 42e5851..7e96921 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -667,8 +667,14 @@ AC_DEFUN([LIBZMQ_CHECK_POLLER_SELECT], [{
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[
+#ifdef ZMQ_HAVE_WINDOWS
+#include "winsock2.h"
+#elif defined ZMQ_HAVE_OPENVMS
+#include <sys/types.h>
+#include <sys/time.h>
+#else
#include <sys/select.h>
-#include <stdlib.h>
+#endif
],
[[
fd_set t_rfds;
@@ -678,7 +684,7 @@ FD_ZERO(&t_rfds);
FD_SET(0, &t_rfds);
tv.tv_sec = 5;
-v.tv_usec = 0;
+tv.tv_usec = 0;
select(1, &t_rfds, NULL, NULL, &tv);
]]