pipe2: Remove dependency on 'nonblocking' module.

[gnulib.git] / lib / pipe2.c

diff --git a/lib/pipe2.c b/lib/pipe2.c
index 18098c4..f50dae6 100644 (file)
--- a/lib/pipe2.c
+++ b/lib/pipe2.c
@@ -24,7 +24,11 @@
 #include <fcntl.h>
 
 #include "binary-io.h"
-#include "nonblocking.h"
+#include "verify.h"
+
+#if GNULIB_defined_O_NONBLOCK
+# include "nonblocking.h"
+#endif
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 /* Native Woe32 API.  */
@@ -69,12 +73,19 @@ pipe2 (int fd[2], int flags)
   if (_pipe (fd, 4096, flags & ~O_NONBLOCK) < 0)
     return -1;
 
+  /* O_NONBLOCK handling.
+     On native Windows platforms, O_NONBLOCK is defined by gnulib.  Use the
+     functions defined by the gnulib module 'nonblocking'.  */
+# if GNULIB_defined_O_NONBLOCK
   if (flags & O_NONBLOCK)
     {
       if (set_nonblocking_flag (fd[0], true) != 0
           || set_nonblocking_flag (fd[1], true) != 0)
         goto fail;
     }
+# else
+  verify (O_NONBLOCK == 0);
+# endif
 
   return 0;
 
@@ -88,6 +99,8 @@ pipe2 (int fd[2], int flags)
      says that initially, the O_NONBLOCK and FD_CLOEXEC flags are cleared on
      both fd[0] and fd[1].  */
 
+  /* O_NONBLOCK handling.
+     On Unix platforms, O_NONBLOCK is defined by the system.  Use fcntl().  */
   if (flags & O_NONBLOCK)
     {
       int fcntl_flags;