Thread (11 messages) flat view 11 messages, 3 authors, 2016-06-15
DORMANTno replies

Revision rfc of 4 in this series.

Revisions (4)
  1. rfc current
  2. v2 [diff vs current]
  3. v3 [diff vs current]
  4. v4 [diff vs current]

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

From: Erik Faye-Lund <hidden>
Date: 2016-06-15 22:51:33
Subsystem: the rest · Maintainer: Linus Torvalds

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 <redacted>
---

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help