From: "Joachim Schmitz" <jojo@schmitz-digital.de>
To: git@vger.kernel.org
Subject: [PATCH v6 2/4] fix some win32 specific dependencies in poll.c
Date: Mon, 17 Sep 2012 08:56:28 +0200 [thread overview]
Message-ID: <k36hj7$m15$1@ger.gmane.org> (raw)
In-Reply-To: k36h3i$ihb$1@ger.gmane.org
In order for non-win32 platforms to be able to use poll.c, #ifdef the
inclusion of two header files in the same manner as it's done elsewhere
in git.
Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de>
---
compat/poll/poll.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index 9e7a25c..e4b8319 100644
--- a/compat/poll/poll.c
+++ b/compat/poll/poll.c
@@ -24,7 +24,9 @@
# pragma GCC diagnostic ignored "-Wtype-limits"
#endif
-#include <malloc.h>
+#if defined(WIN32)
+# include <malloc.h>
+#endif
#include <sys/types.h>
@@ -48,7 +50,9 @@
#else
# include <sys/time.h>
# include <sys/socket.h>
-# include <sys/select.h>
+# ifndef NO_SYS_SELECT_H
+# include <sys/select.h>
+# endif
# include <unistd.h>
#endif
--
1.7.12
next prev parent reply other threads:[~2012-09-17 7:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 6:48 [PATCH v6 0/4] Support non-WIN32 systems lacking poll() Joachim Schmitz
2012-09-17 6:53 ` [PATCH v6 1/4] make poll available for other platforms lacking it Joachim Schmitz
2012-09-17 6:56 ` Joachim Schmitz [this message]
2012-09-17 7:02 ` [PATCH v6 3/4] poll() exits too early with EFAULT if 1st arg is NULL Joachim Schmitz
2012-09-17 7:03 ` [PATCH v6 4/4] make poll() work on platforms that can't recv() on a non-socket Joachim Schmitz
2012-09-17 21:03 ` [PATCH v6 0/4] Support non-WIN32 systems lacking poll() Junio C Hamano
2012-09-17 21:10 ` [PATCH v7 " Joachim Schmitz
2012-09-17 21:34 ` Joachim Schmitz
2012-09-17 22:38 ` Junio C Hamano
2012-09-18 6:22 ` Joachim Schmitz
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='k36hj7$m15$1@ger.gmane.org' \
--to=jojo@schmitz-digital.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.