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

diff --git a/src/ESIExpatParser.h b/src/ESIExpatParser.h
index c34e4b3f2d65b798b49f0665c88f1b501f84c035..2eb8c3c9ad36baf5658076fde8c1a0b8b50b935b 100644 (file)
--- 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 5c6f97c7949e2274b545efa39cc7ba29d8f53ddf..3a370cc416fc4b6293862787425ad674b2f0f914 100644 (file)
--- 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 */