From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 22 Apr 2008 12:17:55 +0000 (+1200)
Subject: Rollback rev 8955 - patch already applied
X-Git-Tag: SQUID_3_1_0_1~49^2~277
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08d75160d1cf7bc73b4e9f14567bea6837026c16;p=thirdparty%2Fsquid.git

Rollback rev 8955 - patch already applied
---

diff --git a/src/ESIExpatParser.h b/src/ESIExpatParser.h
index 2eb8c3c9ad..c34e4b3f2d 100644
--- a/src/ESIExpatParser.h
+++ b/src/ESIExpatParser.h
@@ -35,8 +35,6 @@
 
 #if USE_SQUID_ESI
 
-#if USE_SQUID_ESI
-
 #include "ESIParser.h"
 #include "expat.h"
 
@@ -68,6 +66,4 @@ private:
 
 #endif /* USE_SQUID_ESI */
 
-#endif /* USE_SQUID_ESI */
-
 #endif /* SQUID_ESIEXPATPARSER_H */
diff --git a/src/ESILibxml2Parser.h b/src/ESILibxml2Parser.h
index 3a370cc416..5c6f97c794 100644
--- a/src/ESILibxml2Parser.h
+++ b/src/ESILibxml2Parser.h
@@ -42,8 +42,6 @@
 
 #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
@@ -81,6 +79,4 @@ private:
 
 #endif /* USE_SQUID_ESI */
 
-#endif /* USE_SQUID_ESI */
-
 #endif /* SQUID_ESILIBXML2PARSER_H */