From: serassio <>
Date: Sun, 20 Mar 2005 02:56:15 +0000 (+0000)
Subject: Temporary fix of a conflict between libxml2 and expat include files
X-Git-Tag: SQUID_3_0_PRE4~827
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc8fb6f8ae6fe171de3baaf3490215cf7c3b536a;p=thirdparty%2Fsquid.git

Temporary fix of a conflict between libxml2 and expat include files
before the resolution of bug #1155: ESI parsers need to be made modular

Affected Platforms: FreeBSD 5.3, Solaris 9, Cygwin, MinGW, Debian Sarge,
Fedora Core 3 and probably many others.
---

diff --git a/src/ESIParser.cc b/src/ESIParser.cc
index a84bb15794..10e5956740 100644
--- a/src/ESIParser.cc
+++ b/src/ESIParser.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESIParser.cc,v 1.4 2004/12/20 16:30:32 robertc Exp $
+ * $Id: ESIParser.cc,v 1.5 2005/03/19 19:56:15 serassio Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -35,9 +35,9 @@
 
 #include "squid.h"
 #include "ESIParser.h"
+#include "ESILibxml2Parser.h"
 #include "ESIExpatParser.h"
 #include "ESICustomParser.h"
-#include "ESILibxml2Parser.h"
 
 char *ESIParser::Type = NULL;