Use O_NDELAY rather than FNDELAY

diff --git a/src/comm.cc b/src/comm.cc
index f516191aa189e16ffec2ebcdd525667b37c0322b..60c031b29477f396e0fd33109ef1e36b465b2179 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,5 +1,5 @@
 
-/* $Id: comm.cc,v 1.9 1996/03/27 18:15:41 wessels Exp $ */
+/* $Id: comm.cc,v 1.10 1996/03/28 05:21:46 wessels Exp $ */
 
 #include "squid.h"
 
@@ -173,8 +173,8 @@ int comm_open(io_type, port, handler, note)
            return (COMM_ERROR);
        }
 #else
-       if (fcntl(new_socket, F_SETFL, FNDELAY)) {
-           debug(0, 0, "comm_open: FD %d: Failure to set FNDELAY: %s\n",
+       if (fcntl(new_socket, F_SETFL, O_NDELAY)) {
+           debug(0, 0, "comm_open: FD %d: Failure to set O_NDELAY: %s\n",
                new_socket, xstrerror());
            return (COMM_ERROR);
        }
@@ -815,8 +815,8 @@ int commSetNonBlocking(fd)
        return (COMM_ERROR);
     }
 #else
-    if (fcntl(fd, F_SETFL, FNDELAY)) {
-       debug(0, 0, "comm_open: FD %d: error setting FNDELAY: %s\n",
+    if (fcntl(fd, F_SETFL, O_NDELAY)) {
+       debug(0, 0, "comm_open: FD %d: error setting O_NDELAY: %s\n",
            fd, xstrerror());
        return (COMM_ERROR);
     }

diff --git a/src/disk.cc b/src/disk.cc
index c277bc2d1e498be6b92b951b301299e226382e05..4ae1476803c3d80a4e3c9c9954e270b444e3cd84 100644 (file)
--- a/src/disk.cc
+++ b/src/disk.cc
@@ -1,4 +1,4 @@
-/* $Id: disk.cc,v 1.5 1996/03/27 18:15:43 wessels Exp $ */
+/* $Id: disk.cc,v 1.6 1996/03/28 05:21:46 wessels Exp $ */
 
 #include "squid.h"
 
@@ -143,8 +143,8 @@ int file_open(path, handler, mode)
        return DISK_ERROR;
     }
 #else
-    if (fcntl(fd, F_SETFL, FNDELAY) < 0) {
-       debug(0, 0, "file_open: FD %d: Failure to set FNDELAY: %s\n",
+    if (fcntl(fd, F_SETFL, O_NDELAY) < 0) {
+       debug(0, 0, "file_open: FD %d: Failure to set O_NDELAY: %s\n",
            fd, xstrerror());
        return DISK_ERROR;
     }