From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 22 Apr 2008 11:49:48 +0000 (+1200)
Subject: Wrap ESI headers for .h testing on systems without Expat or XML libraries
X-Git-Tag: SQUID_3_1_0_1~49^2~278
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d80f7087b1a9887ed0acfeff9e6fbbfedec19b0;p=thirdparty%2Fsquid.git

Wrap ESI headers for .h testing on systems without Expat or XML libraries
---

diff --git a/src/ESIExpatParser.h b/src/ESIExpatParser.h
index c34e4b3f2d..2eb8c3c9ad 100644
--- a/src/ESIExpatParser.h
+++ b/src/ESIExpatParser.h
@@ -35,6 +35,8 @@
 
 #if USE_SQUID_ESI
 
+#if USE_SQUID_ESI
+
 #include "ESIParser.h"
 #include "expat.h"
 
@@ -66,4 +68,6 @@ private:
 
 #endif /* USE_SQUID_ESI */
 
+#endif /* USE_SQUID_ESI */
+
 #endif /* SQUID_ESIEXPATPARSER_H */
diff --git a/src/ESILibxml2Parser.h b/src/ESILibxml2Parser.h
index 5c6f97c794..3a370cc416 100644
--- a/src/ESILibxml2Parser.h
+++ b/src/ESILibxml2Parser.h
@@ -42,6 +42,8 @@
 
 #if USE_SQUID_ESI
 
+#if USE_SQUID_ESI
+
 #include "ESIParser.h"
 // workaround for definition of "free" that prevents include of
 // parser.h from libxml2 without errors
@@ -79,4 +81,6 @@ private:
 
 #endif /* USE_SQUID_ESI */
 
+#endif /* USE_SQUID_ESI */
+
 #endif /* SQUID_ESILIBXML2PARSER_H */