From: Erik Faye-Lund <kusmabite@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH/RFC 2/3] mingw: fix compilation of poll-emulation
Date: Thu, 7 Jul 2011 13:43:08 +0200 [thread overview]
Message-ID: <1310038989-5724-3-git-send-email-kusmabite@gmail.com> (raw)
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
next prev parent reply other threads:[~2011-07-07 11:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-07 11:43 [PATCH/RFC 0/3] port upload-archive to windows Erik Faye-Lund
2011-07-07 11:43 ` [PATCH/RFC 1/3] compat/win32/sys/poll.c: upgrade from upstream Erik Faye-Lund
2011-07-07 11:43 ` Erik Faye-Lund [this message]
2011-07-07 11:43 ` [PATCH/RFC 3/3] upload-archive: use start_command instead of fork Erik Faye-Lund
2011-07-07 18:21 ` Johannes Sixt
2011-07-07 18:39 ` Erik Faye-Lund
2011-07-07 19:15 ` Jeff King
2011-07-07 22:25 ` Erik Faye-Lund
2011-07-07 22:27 ` Jeff King
2011-07-07 22:37 ` Erik Faye-Lund
2011-07-07 22:44 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310038989-5724-3-git-send-email-kusmabite@gmail.com \
--to=kusmabite@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).