From: wessels <>
Date: Tue, 27 Apr 1999 03:36:02 +0000 (+0000)
Subject: moved #define SQUID_NONBLOCK if-statement to src/squid.h because
X-Git-Tag: SQUID_3_0_PRE1~2246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b7568e66335ac9ce2cb2636246c78ac7adb2acc;p=thirdparty%2Fsquid.git

moved #define SQUID_NONBLOCK if-statement to src/squid.h because
O_NONBLOCK probably won't be defined when config.h is read!
---

diff --git a/src/squid.h b/src/squid.h
index ba572d6aaf..be542e135e 100644
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,7 +1,7 @@
 
 /*
- * $Id: squid.h,v 1.188 1999/04/23 02:57:32 wessels Exp $
- * $Id: squid.h,v 1.188 1999/04/23 02:57:32 wessels Exp $
+ * $Id: squid.h,v 1.189 1999/04/26 21:36:02 wessels Exp $
+ * $Id: squid.h,v 1.189 1999/04/26 21:36:02 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -391,5 +391,14 @@ struct rusage {
 extern struct snmp_mib_tree *Mib;
 #endif
 
+/*
+ * Hey dummy, don't be tempted to move this to lib/config.h.in again.  O_NONBLOCK
+ * will not be defined there because you didn't #include <fcntl.h> yet.
+ */
+#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 */