From: Eric Blake <eblake@redhat.com>
Date: Fri, 8 Apr 2011 16:44:53 +0000 (-0600)
Subject: pipe-filter: drop O_NONBLOCK workarounds
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7f37a2118b1a1384951d8ac8c58fe3ae1a7fd71;p=pspp

pipe-filter: drop O_NONBLOCK workarounds

* modules/pipe-filter-gi (Depends-on): Add fcntl-h.
* modules/pipe-filter-ii (Depends-on): Likewise.
* lib/pipe-filter-aux.h (O_NONBLOCK): Delete workaround.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 1af3b71985..fe0a886391 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-04-08  Eric Blake  <eblake@redhat.com>
 
+	pipe-filter: drop O_NONBLOCK workarounds
+	* modules/pipe-filter-gi (Depends-on): Add fcntl-h.
+	* modules/pipe-filter-ii (Depends-on): Likewise.
+	* lib/pipe-filter-aux.h (O_NONBLOCK): Delete workaround.
+
 	nonblocking: provide O_NONBLOCK for mingw
 	* modules/nonblocking (Depends-on): Add open.
 	(configure.ac): Set new witness macro.
diff --git a/lib/pipe-filter-aux.h b/lib/pipe-filter-aux.h
index 118970b850..8c6cb747aa 100644
--- a/lib/pipe-filter-aux.h
+++ b/lib/pipe-filter-aux.h
@@ -102,9 +102,6 @@ nonintr_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
 #endif
 
 /* Non-blocking I/O.  */
-#ifndef O_NONBLOCK
-# define O_NONBLOCK O_NDELAY
-#endif
 #if HAVE_SELECT
 # define IS_EAGAIN(errcode) 0
 #else
diff --git a/modules/pipe-filter-gi b/modules/pipe-filter-gi
index 7122c1ad49..f2e6fc032c 100644
--- a/modules/pipe-filter-gi
+++ b/modules/pipe-filter-gi
@@ -11,6 +11,7 @@ spawn-pipe
 wait-process
 error
 exit
+fcntl-h
 gettext-h
 stdbool
 stdint
diff --git a/modules/pipe-filter-ii b/modules/pipe-filter-ii
index f845a8f5ac..5f7d05b9de 100644
--- a/modules/pipe-filter-ii
+++ b/modules/pipe-filter-ii
@@ -11,6 +11,7 @@ spawn-pipe
 wait-process
 error
 exit
+fcntl-h
 gettext-h
 stdbool
 stdint