Squid-2.2.STABLE3: Use O_NONBLOCK instead of O_NDELAY
    The check for O_NONBLOCK was malplaced and O_NDELAY was always
    selected even if O_NONBLOCK is available.

Index: squid/include/config.h.in
diff -u squid/include/config.h.in:1.1.1.12 squid/include/config.h.in:1.1.1.12.12.1
--- squid/include/config.h.in:1.1.1.12	Sun Feb 14 23:29:38 1999
+++ squid/include/config.h.in	Tue May 25 21:12:27 1999
@@ -162,12 +162,6 @@
 #define xislower(x) islower((unsigned char)x)
 #define xisalpha(x) isalpha((unsigned char)x)
 
-#if defined(O_NONBLOCK) && !defined(_SQUID_SUNOS_) && !defined(_SQUID_SOLARIS_)
-#define SQUID_NONBLOCK O_NONBLOCK
-#else
-#define SQUID_NONBLOCK O_NDELAY
-#endif
-
 #if HAVE_RANDOM
 #define squid_random random
 #define squid_srandom srandom
Index: squid/src/squid.h
diff -u squid/src/squid.h:1.1.1.21 squid/src/squid.h:1.1.1.21.8.2
--- squid/src/squid.h:1.1.1.21	Tue Apr 20 17:26:13 1999
+++ squid/src/squid.h	Tue May 25 21:29:30 1999
@@ -389,5 +389,10 @@
 extern struct snmp_mib_tree *Mib;
 #endif
 
+#if defined(O_NONBLOCK) && !defined(_SQUID_SUNOS_) && !defined(_SQUID_SOLARIS_)
+#define SQUID_NONBLOCK O_NONBLOCK
+#else
+#define SQUID_NONBLOCK O_NDELAY
+#endif
 
 #endif /* SQUID_H */