From f202d83da4be9fe99c49bd25c01a2f92c42d06cb Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Thu, 15 Jul 1999 17:57:22 +0000 Subject: [PATCH] Necko only! not part of the build. back out gordon's change to fix the windows build until he has a chance to take a look at it. git-svn-id: svn://10.0.0.236/trunk@39538 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/util/src/nsNeckoUtil.cpp | 16 ++++++++-------- mozilla/netwerk/util/src/nsNetStreamLoader.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mozilla/netwerk/util/src/nsNeckoUtil.cpp b/mozilla/netwerk/util/src/nsNeckoUtil.cpp index 5db4b6af262..70431f9fe71 100644 --- a/mozilla/netwerk/util/src/nsNeckoUtil.cpp +++ b/mozilla/netwerk/util/src/nsNeckoUtil.cpp @@ -24,7 +24,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); -PR_PUBLIC_API(nsresult) +nsresult NS_NewURI(nsIURI* *result, const char* spec, nsIURI* baseURI) { nsresult rv; @@ -35,7 +35,7 @@ NS_NewURI(nsIURI* *result, const char* spec, nsIURI* baseURI) return rv; } -PR_PUBLIC_API(nsresult) +nsresult NS_NewURI(nsIURI* *result, const nsString& spec, nsIURI* baseURI) { // XXX if the string is unicode, GetBuffer() returns null. @@ -49,7 +49,7 @@ NS_NewURI(nsIURI* *result, const nsString& spec, nsIURI* baseURI) return rv; } -PR_PUBLIC_API(nsresult) +nsresult NS_OpenURI(nsIChannel* *result, nsIURI* uri, nsILoadGroup* group) { nsresult rv; @@ -72,7 +72,7 @@ NS_OpenURI(nsIChannel* *result, nsIURI* uri, nsILoadGroup* group) return rv; } -PR_PUBLIC_API(nsresult) +nsresult NS_OpenURI(nsIInputStream* *result, nsIURI* uri, nsILoadGroup* group) { nsresult rv; @@ -90,7 +90,7 @@ NS_OpenURI(nsIInputStream* *result, nsIURI* uri, nsILoadGroup* group) return rv; } -PR_PUBLIC_API(nsresult) +nsresult NS_OpenURI(nsIStreamListener* aConsumer, nsISupports* context, nsIURI* uri, nsILoadGroup* group) { @@ -105,7 +105,7 @@ NS_OpenURI(nsIStreamListener* aConsumer, nsISupports* context, return rv; } -PR_PUBLIC_API(nsresult) +nsresult NS_MakeAbsoluteURI(const char* spec, nsIURI* baseURI, char* *result) { nsresult rv; @@ -115,7 +115,7 @@ NS_MakeAbsoluteURI(const char* spec, nsIURI* baseURI, char* *result) return serv->MakeAbsolute(spec, baseURI, result); } -PR_PUBLIC_API(nsresult) +nsresult NS_MakeAbsoluteURI(const nsString& spec, nsIURI* baseURI, nsString& result) { char* resultStr; @@ -131,7 +131,7 @@ NS_MakeAbsoluteURI(const nsString& spec, nsIURI* baseURI, nsString& result) return rv; } -PR_PUBLIC_API(nsresult) +nsresult NS_NewLoadGroup(nsILoadGroup* parent, nsISupports* outer, nsILoadGroup* *result) { nsresult rv; diff --git a/mozilla/netwerk/util/src/nsNetStreamLoader.cpp b/mozilla/netwerk/util/src/nsNetStreamLoader.cpp index a522039fe53..f0a0a79c2f5 100644 --- a/mozilla/netwerk/util/src/nsNetStreamLoader.cpp +++ b/mozilla/netwerk/util/src/nsNetStreamLoader.cpp @@ -183,7 +183,7 @@ nsUnicharStreamLoader::OnDataAvailable(nsIChannel* channel, nsISupports *ctxt, return rv; } -extern PR_PUBLIC_API(nsresult) +extern nsresult NS_NewUnicharStreamLoader(nsIUnicharStreamLoader** aInstancePtrResult, nsIURI* aURL, nsILoadGroup* aLoadGroup,