From: Joachim Schmitz <jojo@schmitz-digital.de>
Date: Mon, 17 Sep 2012 21:18:27 +0000 (+0200)
Subject: fix some win32 specific dependencies in poll.c
X-Git-Tag: v1.8.0-rc0~22^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=98c573a902d47722b062579c5a9d9e661b4263e4;p=git.git

fix some win32 specific dependencies in poll.c

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index 403eaa7a3..49541f19c 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