compat: Split poll & pollfd detection

Some systems might have one but not the other

Author: chouquette

compat/compat.h

@@ -108,7 +108,7 @@ extern int inet_pton(int af, const char *src, void *dst);
 
 #endif // _WIN32
 
-#ifndef HAVE_POLL
+#ifndef HAVE_STRUCT_POLLFD
 enum
 {
     POLLERR=0x1,
@@ -127,6 +127,9 @@ struct pollfd
     unsigned events;
     unsigned revents;
 };
+#endif
+
+#ifndef HAVE_POLL
 int poll(struct pollfd *fds, unsigned nfds, int timeout);
 #endif
 

configure.ac

@@ -245,6 +245,17 @@ AC_LINK_IFELSE([
 
 LIBS=${LIBS_SAVE}
 
+dnl Check for struct pollfd
+AC_CHECK_TYPES([struct pollfd],,,
+[#include <sys/types.h>
+#if HAVE_POLL
+# include <poll.h>
+#elif defined (_WIN32)
+# include <winsock2.h>
+#endif
+])
+
+
 AC_CHECK_MEMBER([struct ifaddrs.ifa_addr],[
     AC_DEFINE([HAVE_IFADDRS],[1],[Define to 1 if you have ifaddrs.ifa_addr function])],
     [],[[#include <ifaddrs.h>]])