From: wessels <>
Date: Wed, 31 Dec 1997 11:58:04 +0000 (+0000)
Subject: From:    Stewart Forster <slf@connect.com.au>
X-Git-Tag: SQUID_3_0_PRE1~4331
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6425b967cd7da4797a7ef9e1da8dcb86c258ce78;p=thirdparty%2Fsquid.git

From:    Stewart Forster <slf@connect.com.au>
The patch given by Oskar Pearson was too Linux-centric and ignored
all other OS's desires to use poll().  The corrected business is
below.
---

diff --git a/src/squid.h b/src/squid.h
index 2faaa01815..96840f693b 100644
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.145 1997/12/21 11:21:11 kostas Exp $
+ * $Id: squid.h,v 1.146 1997/12/31 04:58:04 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -170,13 +170,19 @@
 #define assert(X) ((void)0)
 #endif
 
-/* With linux, poll.h might not be available, even though poll(2) is */
-/* Oskar Pearson <oskar@is.co.za> */
+/*
+ * With linux and other systems, poll.h might not be available,
+ * even though poll(2) is.
+ *  -- Oskar Pearson <oskar@is.co.za>
+ *  -- Stewart Forster <slf@connect.com.au>
+ */
 #if HAVE_POLL
-#if HAVE_POLL_H && defined(_SQUID_LINUX_)
+#if defined(_SQUID_LINUX_)
+#if HAVE_POLL_H
 #include <poll.h>
-#else
+#else /* HAVE_POLL_H */
 #undef HAVE_POLL
+#endif /* HAVE_POLL_H */
 #endif /* end of Linux workaround */
 #endif /* HAVE_POLL */