From: Amos Jeffries Date: Thu, 3 Apr 2008 11:56:42 +0000 (+1200) Subject: Wrap Delay Pools module headers X-Git-Tag: BASIC_TPROXY4~4^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb8ed10da753b375e5640f4913892860dfd72298;p=thirdparty%2Fsquid.git Wrap Delay Pools module headers - prevents all compiling and testing of the headers when the component is disabled. --- diff --git a/src/DelayId.h b/src/DelayId.h index 682c81564e..8a0a860b41 100644 --- a/src/DelayId.h +++ b/src/DelayId.h @@ -35,6 +35,8 @@ #ifndef SQUID_DELAYID_H #define SQUID_DELAYID_H +#if DELAY_POOLS + class ClientHttpRequest; #include "DelayIdComposite.h" @@ -64,4 +66,5 @@ private: bool markedAsNoDelay; }; +#endif /* DELAY_POOLS */ #endif /* SQUID_DELAYID_H */ diff --git a/src/DelayTagged.h b/src/DelayTagged.h index f26bc83695..76d629b3db 100644 --- a/src/DelayTagged.h +++ b/src/DelayTagged.h @@ -33,11 +33,12 @@ * * Copyright (c) 2003, Robert Collins */ +#ifndef DELAYTAGGED_H +#define DELAYTAGGED_H #include "config.h" -#ifndef DELAYTAGGED_H -#define DELAYTAGGED_H +#if DELAY_POOLS #include "squid.h" #include "authenticate.h" @@ -107,4 +108,5 @@ private: Splay buckets; }; +#endif /* DELAY_POOLS */ #endif /* DELAYTAGGED_H */ diff --git a/src/DelayUser.h b/src/DelayUser.h index 449bdf7a20..781ac66e2c 100644 --- a/src/DelayUser.h +++ b/src/DelayUser.h @@ -33,11 +33,12 @@ * * Copyright (c) 2003, Robert Collins */ +#ifndef DELAYUSER_H +#define DELAYUSER_H #include "config.h" -#ifndef DELAYUSER_H -#define DELAYUSER_H +#if DELAY_POOLS #include "squid.h" #include "authenticate.h" @@ -106,4 +107,5 @@ private: Splay buckets; }; +#endif /* DELAY_POOLS */ #endif /* DELAYUSER_H */ diff --git a/src/DelayVector.h b/src/DelayVector.h index bc7cc848a2..8bd7dd418c 100644 --- a/src/DelayVector.h +++ b/src/DelayVector.h @@ -31,10 +31,13 @@ * * Copyright (c) 2003, Robert Collins */ - #ifndef SQUID_DELAYVECTOR_H #define SQUID_DELAYVECTOR_H +#include "config.h" + +#if DELAY_POOLS + #include "CompositePoolNode.h" /// \ingroup DelayPoolsAPI @@ -85,4 +88,5 @@ private: typedef Vector::const_iterator const_iterator; }; +#endif /* DELAY_POOLS */ #endif /* SQUID_DELAYVECTOR_H */