Fix Mac bustage. I though 'L' was enabled on Win32 for NS_LITERAL_STRING(), too. Guess I was wrong.

This commit is contained in:
waterson%netscape.com 2000-07-20 20:15:08 +00:00
Родитель 7e40b8c748
Коммит 6b73658863
1 изменённых файлов: 5 добавлений и 11 удалений

Просмотреть файл

@ -483,7 +483,7 @@ RDFXMLDataSourceImpl::Init()
// should've defined the RDF namespace to be _something_, and we // should've defined the RDF namespace to be _something_, and we
// should just look at _that_ and use it. Oh well. // should just look at _that_ and use it. Oh well.
nsIAtom* rdfPrefix = NS_NewAtom("RDF"); nsIAtom* rdfPrefix = NS_NewAtom("RDF");
AddNameSpace(rdfPrefix, NS_LITERAL_STRING(RDF_NAMESPACE_URI)); AddNameSpace(rdfPrefix, NS_ConvertASCIItoUCS2(RDF_NAMESPACE_URI));
NS_IF_RELEASE(rdfPrefix); NS_IF_RELEASE(rdfPrefix);
if (gRefCnt++ == 0) { if (gRefCnt++ == 0) {
@ -1512,10 +1512,6 @@ nsresult
RDFXMLDataSourceImpl::SerializeContainer(nsIOutputStream* aStream, RDFXMLDataSourceImpl::SerializeContainer(nsIOutputStream* aStream,
nsIRDFResource* aContainer) nsIRDFResource* aContainer)
{ {
static const char kRDFBag[] = "RDF:Bag";
static const char kRDFSeq[] = "RDF:Seq";
static const char kRDFAlt[] = "RDF:Alt";
nsresult rv; nsresult rv;
const PRUnichar* tag; const PRUnichar* tag;
@ -1523,13 +1519,13 @@ static const char kRDFAlt[] = "RDF:Alt";
// appropriate tag-open sequence // appropriate tag-open sequence
if (IsA(mInner, aContainer, kRDF_Bag)) { if (IsA(mInner, aContainer, kRDF_Bag)) {
tag = NS_LITERAL_STRING(kRDFBag); tag = NS_LITERAL_STRING("RDF:Bag");
} }
else if (IsA(mInner, aContainer, kRDF_Seq)) { else if (IsA(mInner, aContainer, kRDF_Seq)) {
tag = NS_LITERAL_STRING(kRDFSeq); tag = NS_LITERAL_STRING("RDF:Seq");
} }
else if (IsA(mInner, aContainer, kRDF_Alt)) { else if (IsA(mInner, aContainer, kRDF_Alt)) {
tag = NS_LITERAL_STRING(kRDFAlt); tag = NS_LITERAL_STRING("RDF:Alt");
} }
else { else {
NS_ASSERTION(PR_FALSE, "huh? this is _not_ a container."); NS_ASSERTION(PR_FALSE, "huh? this is _not_ a container.");
@ -1677,9 +1673,7 @@ static const char kXMLNS[] = "\n xmlns";
nsresult nsresult
RDFXMLDataSourceImpl::SerializeEpilogue(nsIOutputStream* aStream) RDFXMLDataSourceImpl::SerializeEpilogue(nsIOutputStream* aStream)
{ {
static const char kCloseRDF[] = "</RDF:RDF>\n"; rdf_BlockingWrite(aStream, NS_LITERAL_STRING("</RDF:RDF>\n"));
rdf_BlockingWrite(aStream, NS_LITERAL_STRING(kCloseRDF));
return NS_OK; return NS_OK;
} }