From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 4 Jan 2009 11:57:57 +0000 (+1300)
Subject: Fix some QoS update build errors.
X-Git-Tag: SQUID_3_2_0_1~1283
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb36f5871bea583affaca8e1215b26399bf47100;p=thirdparty%2Fsquid.git

Fix some QoS update build errors.

Also re-enables testbed testing of the QoS Features which prevented these
being caught earlier.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 85423cd556..bc7d8b91a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1502,8 +1502,7 @@ tests_testDiskIO_SOURCES = \
 	tests/testDiskIO.cc \
 	tests/testDiskIO.h \
 	tests/testMain.cc \
-	tests/stub_cache_manager.cc \
-	ip/stubQosConfig.cc
+	tests/stub_cache_manager.cc
 nodist_tests_testDiskIO_SOURCES= \
 	$(SWAP_TEST_GEN_SOURCES)
 tests_testDiskIO_LDADD = \
diff --git a/src/forward.cc b/src/forward.cc
index 71b876d2a5..a28dd9058e 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -965,7 +965,7 @@ FwdState::dispatch()
 
     netdbPingSite(request->GetHost());
 
-#if USE_ZPH_QOS && _SQUID_LINUX_
+#if USE_ZPH_QOS && defined(_SQUID_LINUX_)
     /* Bug 2537: This part of ZPH only applies to patched Linux kernels. */
 
     /* Retrieves remote server TOS value, and stores it as part of the
diff --git a/src/structs.h b/src/structs.h
index c7bc3ad724..5d3d1df27a 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -125,7 +125,7 @@ struct relist {
 #endif
 
 #if USE_ZPH_QOS
-#include "QosConfig.h"
+#include "ip/QosConfig.h"
 #endif
 
 /* forward decl for SquidConfig, see RemovalPolicy.h */
diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index 59452e5aaa..b9f8eadbf9 100644
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -33,10 +33,6 @@
 #   --enable-win32-service \
 #   --with-localhost-ipv6 \
 #
-#	AYJ: these features have known bugs. They are optional so we don't block on them...
-#	We can't test them automatically everywhere
-#
-#	--enable-zph-qos \
 #
 OPTS=" \
 	--enable-loadable-modules \
@@ -91,6 +87,7 @@ OPTS=" \
 	--enable-vary \
 	--enable-ipv6 \
 	--enable-auto-locale \
+	--enable-zph-qos \
  \
 	--with-aio \
 	--with-build-environment=default \