diff options
| author | Joachim Schmitz <jojo@schmitz-digital.de> | 2012-09-17 21:18:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-17 22:43:20 (GMT) |
| commit | 98c573a902d47722b062579c5a9d9e661b4263e4 (patch) | |
| tree | 695c1e6d5d6b7b04e9559bc8b205be38e24ca5ee /compat | |
| parent | 6d45eb1720294a93e571e843efb851fee70ac5e1 (diff) | |
| download | git-98c573a902d47722b062579c5a9d9e661b4263e4.zip git-98c573a902d47722b062579c5a9d9e661b4263e4.tar.gz git-98c573a902d47722b062579c5a9d9e661b4263e4.tar.bz2 | |
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>
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/poll/poll.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/compat/poll/poll.c b/compat/poll/poll.c index 403eaa7..49541f1 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 |