Skip to content

Commit

Permalink
fix some win32 specific dependencies in poll.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Joachim Schmitz authored and Junio C Hamano committed Sep 17, 2012
1 parent 6d45eb1 commit 98c573a
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions compat/poll/poll.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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

Expand Down

0 comments on commit 98c573a

Please sign in to comment.