RE: [PATCH v3 3/4] fix some win32 specific dependencies in poll.c
From: Joachim Schmitz <hidden>
Date: 2016-06-15 22:54:39
Subsystem:
the rest · Maintainer:
Linus Torvalds
In order for non-win32 platforms to be able to use poll.c, #ifdef the inclusion of two header files Signed-off-by: Joachim Schmitz <redacted> --- 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