* [PATCH v7 2/4] fix some win32 specific dependencies in poll.c
@ 2012-09-17 21:18 Joachim Schmitz
0 siblings, 0 replies; only message in thread
From: Joachim Schmitz @ 2012-09-17 21:18 UTC (permalink / raw)
To: 'Junio C Hamano'; +Cc: git
In order for non-win32 platforms to be able to use poll.c, #ifdef the
inclusion of two header files properly
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-09-17 21:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-17 21:18 [PATCH v7 2/4] fix some win32 specific dependencies in poll.c Joachim Schmitz
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).