Fix Transformiix standalone bustage. r=Pike. Doesn't affect default builds.

content/xslt/src/xml/txXMLParser.cpp

@@ -46,7 +46,8 @@
 #include "nsISyncLoadDOMService.h"
 #include "nsNetUtil.h"
 #else
-#include "xmlparse.h"
+#include "expat_config.h"
+#include "expat.h"
 #endif
 
 #ifdef TX_EXE
@@ -220,8 +221,8 @@ externalEntityRefHandler(XML_Parser aParser,
     // aParser is aUserData is the txXMLParser,
     // we set that in txXMLParser::parse
     NS_ENSURE_TRUE(aParser, XML_ERROR_NONE);
-    return TX_XMLPARSER(aParser)->ExternalEntityRef(aContext, aBase,
+    return ((txXMLParser*)aParser)->ExternalEntityRef(aContext, aBase,
-                                                    aSystemId, aPublicId);
+                                                      aSystemId, aPublicId);
 }
 
 

content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp

@@ -40,7 +40,8 @@
 #include "TxLog.h"
 #include "txStylesheetCompiler.h"
 #include "txURIUtils.h"
-#include "xmlparse.h"
+#include "expat_config.h"
+#include "expat.h"
 
 /**
  *  Implementation of an In-Memory DOM based XML parser.  The actual XML
@@ -157,8 +158,8 @@ externalEntityRefHandler(XML_Parser aParser,
     // aParser is aUserData is the txDriver,
     // we set that in txDriver::parse
     NS_ENSURE_TRUE(aParser, XML_ERROR_NONE);
-    return TX_DRIVER(aParser)->ExternalEntityRef(aContext, aBase,
+    return ((txDriver*)aParser)->ExternalEntityRef(aContext, aBase,
-                                                 aSystemId, aPublicId);
+                                                   aSystemId, aPublicId);
 }