threads / patch / 31573

v7, 4 partsfix some win32 specific dependencies in poll.c

Subject: [PATCH v7 2/4] fix some win32 specific dependencies in poll.c

## tl;dr

One message between Sep 17, 2012 and Sep 17, 2012. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Joachim Schmitz· Sep 17, 2012, 21:18 UTC · lore

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(-)
Show changes to compat/poll/poll.c +6 −2
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

← back to recent threads