From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 27 May 2008 14:01:49 +0000 (+1200)
Subject: Bug 2358: FD_SIZELIMIT redefined FBSD 7.0
X-Git-Tag: SQUID_3_1_0_1~49^2~220
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5bffbd58193e87b9f2fb6f17f8a72a6938b8c34;p=thirdparty%2Fsquid.git

Bug 2358: FD_SIZELIMIT redefined FBSD 7.0

config.h is still REQUIRED minimum first include for any .c/.cc file
even if the old squid.h can be removed.

Why?  the portability code is needed!
---

diff --git a/src/acl.cc b/src/acl.cc
index 8ef258c815..0e4926a539 100644
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -31,6 +31,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
  */
+#include "config.h"
 
 #if 0
 #include "squid.h"
diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 838114e704..5b2bf4a625 100644
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -31,6 +31,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
  */
+#include "config.h"
 
 /* for ClientActiveRequests global */
 #include "dlink.h"
diff --git a/src/dlink.cc b/src/dlink.cc
index 422bcd2e07..3296dd1063 100644
--- a/src/dlink.cc
+++ b/src/dlink.cc
@@ -1,6 +1,7 @@
 /*
  * $Id$
  */
+#include "config.h"
 #include "dlink.h"
 
 /* dlink are Mem-pooled */
diff --git a/src/fs/aufs/StoreFSaufs.cc b/src/fs/aufs/StoreFSaufs.cc
index eceb501a04..65748e5d6f 100644
--- a/src/fs/aufs/StoreFSaufs.cc
+++ b/src/fs/aufs/StoreFSaufs.cc
@@ -32,6 +32,7 @@
  *
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
+#include "config.h"
 
 #if 0
 #include "squid.h"
diff --git a/src/tests/testEvent.cc b/src/tests/testEvent.cc
index 9826963c17..e2d233525b 100644
--- a/src/tests/testEvent.cc
+++ b/src/tests/testEvent.cc
@@ -1,6 +1,4 @@
-#if 0
-#include "squid.h"
-#endif
+#include "config.h"
 
 #include <cppunit/TestAssert.h>
 
diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc
index dc57f9a14e..bd9a028f53 100644
--- a/src/tests/testEventLoop.cc
+++ b/src/tests/testEventLoop.cc
@@ -1,6 +1,4 @@
-#if 0
-#include "squid.h"
-#endif
+#include "config.h"
 
 #include <cppunit/TestAssert.h>
 
diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc
index 4d160573b6..624e0b8dab 100644
--- a/src/tests/testHttpRequest.cc
+++ b/src/tests/testHttpRequest.cc
@@ -1,6 +1,4 @@
-#if 0
-#include "squid.h"
-#endif
+#include "config.h"
 
 #include <cppunit/TestAssert.h>
 
diff --git a/src/tests/testString.cc b/src/tests/testString.cc
index 033906c468..1cf18fb0dc 100644
--- a/src/tests/testString.cc
+++ b/src/tests/testString.cc
@@ -1,6 +1,4 @@
-#if 0
-#include "squid.h"
-#endif
+#include "config.h"
 
 #include "testString.h"
 #include "SquidString.h"
diff --git a/src/tests/testURL.cc b/src/tests/testURL.cc
index 598d6321d0..eb04c532d1 100644
--- a/src/tests/testURL.cc
+++ b/src/tests/testURL.cc
@@ -1,6 +1,4 @@
-#if 0
-#include "squid.h"
-#endif
+#include "config.h"
 
 #include <sstream>
 #include <cppunit/TestAssert.h>
diff --git a/src/tests/testUfs.cc b/src/tests/testUfs.cc
index bc3682bbd2..eaea635650 100644
--- a/src/tests/testUfs.cc
+++ b/src/tests/testUfs.cc
@@ -1,6 +1,4 @@
-#if 0
-#include "squid.h"
-#endif
+#include "config.h"
 
 #include <stdexcept>
 
diff --git a/src/tests/test_http_range.cc b/src/tests/test_http_range.cc
index 8ca76bd579..717dbe522a 100644
--- a/src/tests/test_http_range.cc
+++ b/src/tests/test_http_range.cc
@@ -31,9 +31,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
  */
+#include "config.h"
 
 #if 0
-#include "squid.h"
 //#include "Store.h"
 //#include "client_side_request.h"
 #endif