diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp index 66f3d119896..a4e836548b8 100644 --- a/mozilla/content/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp @@ -38,7 +38,6 @@ #include "nsIDOMComment.h" #include "nsIDOMElement.h" #include "nsIDOMText.h" -#include "nsExpatDTD.h" // XXX The XML world depends on the html atoms #include "nsHTMLAtoms.h" @@ -300,11 +299,8 @@ nsXMLDocument::StartDocumentLoad(nsIURL *aUrl, nsIDTD* theDTD=0; // XXX For now, we'll use the HTML DTD -#ifndef EXPAT NS_NewWellFormed_DTD(&theDTD); -#else - NS_New_Expat_DTD(&theDTD); -#endif + /* Commenting out the call to RegisterDTD() as per rickg's instructions. XML and HTML DTD's are going to be pre-registered withing nsParser. */ // mParser->RegisterDTD(theDTD); diff --git a/mozilla/layout/xml/document/src/nsXMLDocument.cpp b/mozilla/layout/xml/document/src/nsXMLDocument.cpp index 66f3d119896..a4e836548b8 100644 --- a/mozilla/layout/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/layout/xml/document/src/nsXMLDocument.cpp @@ -38,7 +38,6 @@ #include "nsIDOMComment.h" #include "nsIDOMElement.h" #include "nsIDOMText.h" -#include "nsExpatDTD.h" // XXX The XML world depends on the html atoms #include "nsHTMLAtoms.h" @@ -300,11 +299,8 @@ nsXMLDocument::StartDocumentLoad(nsIURL *aUrl, nsIDTD* theDTD=0; // XXX For now, we'll use the HTML DTD -#ifndef EXPAT NS_NewWellFormed_DTD(&theDTD); -#else - NS_New_Expat_DTD(&theDTD); -#endif + /* Commenting out the call to RegisterDTD() as per rickg's instructions. XML and HTML DTD's are going to be pre-registered withing nsParser. */ // mParser->RegisterDTD(theDTD);