[PATCH/RFC 2/3] mingw: fix compilation of poll-emulation

From: Erik Faye-Lund <kusmabite@gmail.com>
Date: Jul 7, 2011, 11:43 UTC
Message-ID: <1310038989-5724-3-git-send-email-kusmabite@gmail.com>
In-Reply-To: <1310038989-5724-1-git-send-email-kusmabite@gmail.com>

gnulib has changed the inclusion of poll.h from double quotes to single-quotes. But because compat/win32/sys/ isn't in our include-path, this breaks compilation. Change it back the way it was.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---

Ugh, I don't like this so much; this means that 1/3 is left in a broken state, which is a bit nasty for bisection. But this is the only way I can think of to show what are upstream-changes and what are git-specific.

An alternative is to move Windows' poll emulation out of the 'sys' folder, and enable the NO_SYS_POLL_H-switch for MinGW and MSVC builds.

I'm sure what best approach is. Input, anyone? :)

 compat/win32/sys/poll.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/compat/win32/sys/poll.c b/compat/win32/sys/poll.c
index 403eaa7..225ddce 100644
--- a/compat/win32/sys/poll.c
+++ b/compat/win32/sys/poll.c
@@ -29,7 +29,7 @@
 #include <sys/types.h>
 
 /* Specification.  */
-#include <poll.h>
+#include "poll.h"
 
 #include <errno.h>
 #include <limits.h>

-- 
1.7.6.135.ge14e3f