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 a84bb15794ec372422b7d9ba416a7ad9d7fb4c25..10e59567408b07ef9a3ad5a586b921b6f9e7c2b0 100644 (file)
--- 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;