Add 'configure' parameter to control ITC type

1 files changed, 10 insertions, 14 deletions

diff --git a/src/microhttpd/mhd_itc.h b/src/microhttpd/mhd_itc.h
index 163a4d5f..49909516 100644
--- a/src/microhttpd/mhd_itc.h
+++ b/src/microhttpd/mhd_itc.h
@@ -34,14 +34,19 @@
 #define MHD_ITC_H 1
 #include "mhd_options.h"
 
+/* Force socketpair on native W32 */
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(_MHD_ITC_SOCKETPAIR)
+#error _MHD_ITC_SOCKETPAIR is not defined on naitive W32 platform
+#endif /* _WIN32 && !__CYGWIN__ && !_MHD_ITC_SOCKETPAIR */
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 #include <fcntl.h>
 
-#ifdef HAVE_SYS_EVENTFD_H
-
+#if defined(_MHD_ITC_EVENTFD)
 #include <sys/eventfd.h>
+
 /* **************** Optimized eventfd PIPE implementation ********** */
 
 /**
@@ -114,14 +119,7 @@ MHD_pipe_write_ (struct MHD_Pipe pip,
 #define MHD_itc_nonblocking_(pip) (!0)
 
 
-#else
-
-/* Force don't use pipes on W32 */
-#if defined(_WIN32) && !defined(MHD_DONT_USE_PIPES)
-#define MHD_DONT_USE_PIPES 1
-#endif /* defined(_WIN32) && !defined(MHD_DONT_USE_PIPES) */
-
-#ifndef MHD_DONT_USE_PIPES
+#elif defined(_MHD_ITC_PIPE)
 
 /* **************** STANDARD UNIX PIPE implementation ********** */
 
@@ -201,7 +199,7 @@ MHD_itc_nonblocking_ (struct MHD_Pipe fd);
 
 /* **************** END OF STANDARD UNIX PIPE implementation ********** */
 
-#else /* MHD_DONT_USE_PIPES */
+#elif defined(_MHD_ITC_SOCKETPAIR)
 
 /* **************** PIPE EMULATION by socket pairs ********** */
 
@@ -266,8 +264,6 @@ struct MHD_Pipe
 
 /* **************** END OF PIPE EMULATION by socket pairs ********** */
 
-#endif /* MHD_DONT_USE_PIPES */
-
-#endif /* HAVE_SYS_EVENTFD_H */
+#endif /* _MHD_ITC_SOCKETPAIR */
 
 #endif /* MHD_ITC_H */