put back altering FD_SETSIZE

diff --git a/src/squid.h b/src/squid.h
index a4204c90b6d98dfdb06a60f7dd26a2ad4d061bc4..f38e9953ca9a4792f7da99a4bd217c3af762928f 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.75 1996/11/22 05:07:15 wessels Exp $
+ * $Id: squid.h,v 1.76 1996/11/24 04:16:40 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -33,6 +33,19 @@
 
 #include "config.h"
 
+/*
+ * On some systems, FD_SETSIZE is set to something lower than the
+ * actual number of files which can be opened.  IRIX is one case,
+ * NetBSD is another.  So here we increase FD_SETSIZE to our
+ * configure-discovered maximum *before* including any system .h
+ * files.  If something changes FD_SETSIZE to a lower value, were
+ * hosed...
+ */
+
+#if SQUID_MAXFD > 256
+#define FD_SETSIZE SQUID_MAXFD
+#endif
+
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -222,7 +235,12 @@ typedef unsigned long u_num32;
 #endif
 
 #include "ansiproto.h"
+
+#if HAVE_REGEX_H
+#include <regex.h>
+#else /* HAVE_REGEX_H */
 #include "GNUregex.h"
+#endif /* HAVE_REGEX_H */
 
 typedef void (*SIH) (int, void *);     /* swap in */
 typedef int (*QS) (const void *, const void *);