compat/poll: prepare for targeting Windows Vista

Windows Vista (and later) actually have a working poll(), but we still
cannot use it because it only works on sockets.

So let's detect when we are targeting Windows Vista and undefine those
constants, and define `pollfd` so that we can declare our own pollfd
struct.

We also need to make sure that we override those constants *after*
`winsock2.h` has been `#include`d (otherwise we would not really
override those constants).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index 7ed3fbbea13c994467280ed3e981ae9f37f15c09..ad5dcde439d3db239c29cda25d30e6b3a847a861 100644 (file)
--- a/compat/poll/poll.c
+++ b/compat/poll/poll.c
@@ -29,9 +29,6 @@
 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 

-/* Specification.  */
-#include <poll.h>
-

 #include <errno.h>
 #include <limits.h>
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <assert.h>


@@ -55,6 +52,9 @@
 # include <unistd.h>
 #endif
 
 # include <unistd.h>
 #endif
 

+/* Specification.  */
+#include "poll.h"
+

 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif

diff --git a/compat/poll/poll.h b/compat/poll/poll.h
index cd1995292a536f33eb1bf698eaddd761b34d05bd..1e1597360f44850b98d18390f4cbd268e5b31483 100644 (file)
--- a/compat/poll/poll.h
+++ b/compat/poll/poll.h
@@ -21,6 +21,21 @@
 #ifndef _GL_POLL_H
 #define _GL_POLL_H
 
 #ifndef _GL_POLL_H
 #define _GL_POLL_H
 

+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
+/* Vista has its own, socket-only poll() */
+#undef POLLIN
+#undef POLLPRI
+#undef POLLOUT
+#undef POLLERR
+#undef POLLHUP
+#undef POLLNVAL
+#undef POLLRDNORM
+#undef POLLRDBAND
+#undef POLLWRNORM
+#undef POLLWRBAND
+#define pollfd compat_pollfd
+#endif
+

 /* fake a poll(2) environment */
 #define POLLIN      0x0001      /* any readable data available   */
 #define POLLPRI     0x0002      /* OOB/Urgent readable data      */
 /* fake a poll(2) environment */
 #define POLLIN      0x0001      /* any readable data available   */
 #define POLLPRI     0x0002      /* OOB/Urgent readable data      */