From 86a688302c15353c4fd2287d11df114919064f44 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Wed, 22 Sep 2010 16:52:56 +0400
Subject: [PATCH] Remove bundled expat

---
 CMakeLists.txt                   |    1 -
 Cable/CMakeLists.txt             |    2 +-
 Cable/Generators/CMakeLists.txt  |    2 +-
 Cable/Parsers/CMakeLists.txt     |    2 +-
 Cable/Parsers/cableXMLParser.cxx |   24 ++++++++++++------------
 Executables/CMakeLists.txt       |    4 ++--
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6681ef4..8b46c1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,7 +78,6 @@ INCLUDE_DIRECTORIES(BEFORE
         ${CABLE_BIN}
         ${CABLE_SOURCE}/CxxTypes
         ${CABLE_SOURCE}/Executables
-        ${CABLE_SOURCE}/Expat
         ${CABLE_SOURCE}/Generators
         ${CABLE_SOURCE}/Parsers
         ${CABLE_SOURCE}
diff --git a/Cable/CMakeLists.txt b/Cable/CMakeLists.txt
index d4ef449..8c84213 100644
--- a/Cable/CMakeLists.txt
+++ b/Cable/CMakeLists.txt
@@ -19,7 +19,7 @@ SET(CABLE_VERSION_STRING
 INCLUDE_REGULAR_EXPRESSION ("^(cxx|cable|ct|CxxTypes).*$")
 
 # Build the standard components.
-SUBDIRS (Expat CxxTypes Parsers Generators )
+SUBDIRS (CxxTypes Parsers Generators )
 
 
 # Configure the CABLE version number in the build.
diff --git a/Cable/Generators/CMakeLists.txt b/Cable/Generators/CMakeLists.txt
index 7b20d7c..85bcba4 100644
--- a/Cable/Generators/CMakeLists.txt
+++ b/Cable/Generators/CMakeLists.txt
@@ -9,4 +9,4 @@ ADD_LIBRARY(CableGenerators STATIC
   cableSystemTools.cxx
 )
 
-TARGET_LINK_LIBRARIES(CableGenerators CableParsers CxxTypes CableExpat)
+TARGET_LINK_LIBRARIES(CableGenerators CableParsers CxxTypes expat)
diff --git a/Cable/Parsers/CMakeLists.txt b/Cable/Parsers/CMakeLists.txt
index b46ce0f..4595895 100644
--- a/Cable/Parsers/CMakeLists.txt
+++ b/Cable/Parsers/CMakeLists.txt
@@ -39,4 +39,4 @@ ADD_LIBRARY(CableParsers STATIC
   cableXMLSourceParser.cxx
 )
 
-TARGET_LINK_LIBRARIES(CableParsers CxxTypes CableExpat)
+TARGET_LINK_LIBRARIES(CableParsers CxxTypes expat)
diff --git a/Cable/Parsers/cableXMLParser.cxx b/Cable/Parsers/cableXMLParser.cxx
index c30af8a..2a55651 100644
--- a/Cable/Parsers/cableXMLParser.cxx
+++ b/Cable/Parsers/cableXMLParser.cxx
@@ -16,7 +16,7 @@
 =========================================================================*/
 #include "cableXMLParser.h"
 
-#include "../Expat/expat.h"
+#include <expat.h>
 #include <string.h>
 
 namespace cable
@@ -59,12 +59,12 @@ bool XMLParser::Parse()
   
   // Create the expat XML parser.
   m_Parser = XML_ParserCreate(0);
-  XML_SetElementHandler(m_Parser,
+  XML_SetElementHandler((XML_ParserStruct*)m_Parser,
                         &XMLParser::StartElementFunction,
                         &XMLParser::EndElementFunction);
-  XML_SetCharacterDataHandler(m_Parser,
+  XML_SetCharacterDataHandler((XML_ParserStruct*)m_Parser,
                               &XMLParser::CharacterDataHandlerFunction);
-  XML_SetUserData(m_Parser, this);
+  XML_SetUserData((XML_ParserStruct*)m_Parser, this);
   
   // Parse the input stream.
   bool result = this->ParseStream();
@@ -72,7 +72,7 @@ bool XMLParser::Parse()
   if(result)
     {
     // Tell the expat XML parser about the end-of-input.
-    if(!XML_Parse(m_Parser, "", 0, 1))
+    if(!XML_Parse((XML_ParserStruct*)m_Parser, "", 0, 1))
       {
       this->ReportXmlParseError();
       result = false;
@@ -80,7 +80,7 @@ bool XMLParser::Parse()
     }
   
   // Clean up the parser.
-  XML_ParserFree(m_Parser);
+  XML_ParserFree((XML_ParserStruct*)m_Parser);
   m_Parser = 0;
   
   return result;
@@ -171,33 +171,33 @@ void XMLParser::ReportUnknownElement(const char* element) const
 void XMLParser::ReportXmlParseError() const
 {
   cableErrorMacro("Error parsing XML in stream at line "
-                  << XML_GetCurrentLineNumber(m_Parser)
-                  << ": " << XML_ErrorString(XML_GetErrorCode(m_Parser)));
+                  << XML_GetCurrentLineNumber((XML_ParserStruct*)m_Parser)
+                  << ": " << XML_ErrorString(XML_GetErrorCode((XML_ParserStruct*)m_Parser)));
 }
 
 //----------------------------------------------------------------------------
 unsigned long XMLParser::GetXMLByteIndex() const
 {
-  return XML_GetCurrentByteIndex(m_Parser);
+  return XML_GetCurrentByteIndex((XML_ParserStruct*)m_Parser);
 }
 
 //----------------------------------------------------------------------------
 unsigned long XMLParser::GetXMLLineNumber() const
 {
-  return XML_GetCurrentLineNumber(m_Parser);
+  return XML_GetCurrentLineNumber((XML_ParserStruct*)m_Parser);
 }
 
 //----------------------------------------------------------------------------
 unsigned long XMLParser::GetXMLColumnNumber() const
 {
-  return XML_GetCurrentColumnNumber(m_Parser);
+  return XML_GetCurrentColumnNumber((XML_ParserStruct*)m_Parser);
 }  
 
 //----------------------------------------------------------------------------
 bool XMLParser::ParseBuffer(const char* buffer, unsigned int count)
 {
   // Pass the buffer to the expat XML parser.
-  if(!XML_Parse(m_Parser, buffer, count, 0))
+  if(!XML_Parse((XML_ParserStruct*)m_Parser, buffer, count, 0))
     {
     this->ReportXmlParseError();
     return false;
diff --git a/Executables/CMakeLists.txt b/Executables/CMakeLists.txt
index de23744..a20b42e 100755
--- a/Executables/CMakeLists.txt
+++ b/Executables/CMakeLists.txt
@@ -5,7 +5,7 @@ TARGET_LINK_LIBRARIES(cswig
         swigLib
         CableGenerators
         CableParsers
-        CableExpat 
+	expat
         CxxTypes 
         )
 ADD_DEFINITIONS(-D_cxx_STATIC)
@@ -15,7 +15,7 @@ ADD_EXECUTABLE( cableidx cableidx.cxx)
 TARGET_LINK_LIBRARIES(cableidx
         CableGenerators
         CableParsers
-        CableExpat 
+        expat
         CxxTypes 
         )
 
-- 
1.7.2.3