2 files changed, 2 insertions, 4 deletions
diff --git a/common.c b/common.c
index a32108f..b90d381 100644
--- a/common.c
+++ b/common.c
@@ -310,8 +310,7 @@ SetUpConnectionSocket(int iport, void (*connectionFunc) (int))
 #else
     (void) ioctl(ConnectionSocket, FIOCLEX, 0);
 #endif
-    /* ultrix reads hang on Unix sockets, hpux reads fail */
-#if defined(O_NONBLOCK) && (!defined(ultrix) && !defined(hpux))
+#ifdef O_NONBLOCK
     (void) fcntl(ConnectionSocket, F_SETFL, O_NONBLOCK);
 #else
 #ifdef FIOSNBIO
diff --git a/fd.c b/fd.c
index 43c08da..8fdae9b 100644
--- a/fd.c
+++ b/fd.c
@@ -261,8 +261,7 @@ AcceptConnection(FD ConnectionSocket)
 #else
     (void) ioctl(ClientFD, FIOCLEX, 0);
 #endif
-    /* ultrix reads hang on Unix sockets, hpux reads fail */
-#if defined(O_NONBLOCK) && (!defined(ultrix) && !defined(hpux))
+#ifdef O_NONBLOCK
     (void) fcntl(ClientFD, F_SETFL, O_NONBLOCK);
 #else
 #ifdef FIOSNBIO