From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 9 Apr 2010 01:33:22 +0000 (+1200)
Subject: Bring FDSETSIZE wrappers in with Squid wrapping style.
X-Git-Tag: SQUID_3_2_0_1~308
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85dfb314c11c430a9253c7b05a78c161cde1a0b0;p=thirdparty%2Fsquid.git

Bring FDSETSIZE wrappers in with Squid wrapping style.

Also adding kFreeBSD wrapper to same logic as Linux.
---

diff --git a/compat/fdsetsize.h b/compat/fdsetsize.h
index ad8ddf6b0c..9701197001 100644
--- a/compat/fdsetsize.h
+++ b/compat/fdsetsize.h
@@ -33,7 +33,7 @@
  * __FD_SETSIZE. Ofcourse a user program may NEVER include bits/whatever.h
  * directly, so this is a dirty hack!
  */
-#if defined(_SQUID_LINUX_)
+#if _SQUID_LINUX_ || _SQUID_KFREEBSD_
 #undef CHANGE_FD_SETSIZE
 #define CHANGE_FD_SETSIZE 0
 #include <features.h>
@@ -52,7 +52,7 @@
  * --Marian Durkovic <marian@svf.stuba.sk>
  * --Peter Wemm <peter@spinner.DIALix.COM>
  */
-#if defined(_SQUID_FREEBSD_)
+#if _SQUID_FREEBSD_
 #include <osreldate.h>
 #if __FreeBSD_version < 220000
 #undef CHANGE_FD_SETSIZE
@@ -64,7 +64,7 @@
  * Trying to redefine CHANGE_FD_SETSIZE causes a slew of warnings
  * on Mac OS X Server.
  */
-#if defined(_SQUID_APPLE_)
+#if _SQUID_APPLE_
 #undef CHANGE_FD_SETSIZE
 #define CHANGE_FD_SETSIZE 0
 #endif