diff --git a/mozilla/content/xul/content/src/nsXULAttributes.cpp b/mozilla/content/xul/content/src/nsXULAttributes.cpp
index 6e7cef0dc84..6ee6513d8e9 100644
--- a/mozilla/content/xul/content/src/nsXULAttributes.cpp
+++ b/mozilla/content/xul/content/src/nsXULAttributes.cpp
@@ -126,7 +126,7 @@ nsXULAttribute::QueryInterface(REFNSIID aIID, void** aResult)
 NS_IMETHODIMP
 nsXULAttribute::GetNodeName(nsString& aNodeName)
 {
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     mName->GetUnicode(&unicodeString);
 
     aNodeName.SetString(unicodeString);
@@ -253,7 +253,7 @@ nsXULAttribute::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
 NS_IMETHODIMP
 nsXULAttribute::GetName(nsString& aName)
 {
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     mName->GetUnicode(&unicodeString);
     aName.SetString(unicodeString);
     return NS_OK;
@@ -340,14 +340,14 @@ nsXULAttribute::GetQualifiedName(nsString& aQualifiedName)
         rv = mContent->GetNameSpacePrefixFromId(mNameSpaceID, prefix);
 
         if (NS_SUCCEEDED(rv) && (prefix != nsnull)) {
-            PRUnichar *unicodeString;
+            const PRUnichar *unicodeString;
             prefix->GetUnicode(&unicodeString);
             aQualifiedName.Append(unicodeString);
             aQualifiedName.Append(':');
             NS_RELEASE(prefix);
         }
     }
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     mName->GetUnicode(&unicodeString);
     aQualifiedName.Append(unicodeString);
 }
diff --git a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
index 84e27e4cddd..7405e2963a2 100644
--- a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
+++ b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
@@ -893,7 +893,7 @@ RDFGenericBuilderImpl::CreateElement(PRInt32 aNameSpaceID,
 
     if (aNameSpaceID == kNameSpaceID_HTML) {
         nsCOMPtr<nsIHTMLContent> element;
-        /*const*/ PRUnichar *tagName;
+        const PRUnichar *tagName;
         aTag->GetUnicode(&tagName);
 
         rv = gHTMLElementFactory->CreateInstanceByTag(tagName, getter_AddRefs(element));
@@ -1579,7 +1579,7 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
         rv = aChild->GetValue(getter_Copies(resourceCStr));
         if (NS_FAILED(rv)) return rv;
         
-        PRUnichar *unicodeString;
+        const PRUnichar *unicodeString;
         tag->GetUnicode(&unicodeString);
         nsAutoString tagStr(unicodeString);
         char* tagCStr = tagStr.ToNewCString();
diff --git a/mozilla/editor/base/nsEditor.cpp b/mozilla/editor/base/nsEditor.cpp
index 42c8bd4bb7b..b62f1fd99e3 100644
--- a/mozilla/editor/base/nsEditor.cpp
+++ b/mozilla/editor/base/nsEditor.cpp
@@ -2670,7 +2670,7 @@ nsEditor::NodeIsType(nsIDOMNode *aNode, nsIAtom *aTag)
   {
     nsAutoString tag;
     element->GetTagName(tag);
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     aTag->GetUnicode(&unicodeString);
     if (tag.EqualsIgnoreCase(unicodeString))
     {
diff --git a/mozilla/editor/base/nsHTMLEditor.cpp b/mozilla/editor/base/nsHTMLEditor.cpp
index 39280c3339c..b1b25246c54 100644
--- a/mozilla/editor/base/nsHTMLEditor.cpp
+++ b/mozilla/editor/base/nsHTMLEditor.cpp
@@ -5183,7 +5183,7 @@ nsHTMLEditor::RemoveTextPropertiesForNode(nsIDOMNode *aNode,
           if (gNoisy) { printf("* parent has tag %s\n", tag.ToNewCString()); } // XXX leak!
           if (NS_SUCCEEDED(result))
           {
-            PRUnichar *unicodeString;
+            const PRUnichar *unicodeString;
             aPropName->GetUnicode(&unicodeString);
             if (PR_FALSE==tag.EqualsIgnoreCase(unicodeString))
             {
diff --git a/mozilla/editor/base/nsTextEditor.cpp b/mozilla/editor/base/nsTextEditor.cpp
index f16ebebb857..8781bc658d9 100644
--- a/mozilla/editor/base/nsTextEditor.cpp
+++ b/mozilla/editor/base/nsTextEditor.cpp
@@ -2339,7 +2339,7 @@ NS_IMETHODIMP nsTextEditor::RemoveTextPropertiesForNode(nsIDOMNode *aNode,
         if (gNoisy) { printf("* parent has tag %s\n", tag.ToNewCString()); } // XXX leak!
         if (NS_SUCCEEDED(result))
         {
-          PRUnichar *unicodeString;
+          const PRUnichar *unicodeString;
           aPropName->GetUnicode(&unicodeString);
           if (PR_FALSE==tag.EqualsIgnoreCase(unicodeString))
           {
diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp
index 42c8bd4bb7b..b62f1fd99e3 100644
--- a/mozilla/editor/libeditor/base/nsEditor.cpp
+++ b/mozilla/editor/libeditor/base/nsEditor.cpp
@@ -2670,7 +2670,7 @@ nsEditor::NodeIsType(nsIDOMNode *aNode, nsIAtom *aTag)
   {
     nsAutoString tag;
     element->GetTagName(tag);
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     aTag->GetUnicode(&unicodeString);
     if (tag.EqualsIgnoreCase(unicodeString))
     {
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
index 39280c3339c..b1b25246c54 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
@@ -5183,7 +5183,7 @@ nsHTMLEditor::RemoveTextPropertiesForNode(nsIDOMNode *aNode,
           if (gNoisy) { printf("* parent has tag %s\n", tag.ToNewCString()); } // XXX leak!
           if (NS_SUCCEEDED(result))
           {
-            PRUnichar *unicodeString;
+            const PRUnichar *unicodeString;
             aPropName->GetUnicode(&unicodeString);
             if (PR_FALSE==tag.EqualsIgnoreCase(unicodeString))
             {
diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.cpp
index 8baed80437f..0d1cb07a16f 100644
--- a/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.cpp
@@ -179,7 +179,7 @@ PRInt32 nsHTTPHeaderArray::GetEntry(nsIAtom* aHeader, nsHeaderEntry** aResult)
   count = 0;
   (void)mHTTPHeaders->Count(&count);
   
-  PRUnichar* aHeaderString;
+  const PRUnichar* aHeaderString;
   aHeader->GetUnicode( &aHeaderString );
 
   for (i = 0; i < count; i++) {
@@ -190,7 +190,7 @@ PRInt32 nsHTTPHeaderArray::GetEntry(nsIAtom* aHeader, nsHeaderEntry** aResult)
     element = NS_STATIC_CAST(nsHeaderEntry*, entry);
 
     //TODO get rid of the string compare.  see bug 12755. 
-    PRUnichar* elementString;
+    const PRUnichar* elementString;
     element->mAtom.get()->GetUnicode( &elementString );
     
     if (nsCRT::strcmp(aHeaderString, elementString) == 0) 
diff --git a/mozilla/rdf/base/src/nsRDFContentSink.cpp b/mozilla/rdf/base/src/nsRDFContentSink.cpp
index ebad63cb0cb..a4d0516613f 100644
--- a/mozilla/rdf/base/src/nsRDFContentSink.cpp
+++ b/mozilla/rdf/base/src/nsRDFContentSink.cpp
@@ -1119,7 +1119,7 @@ RDFContentSinkImpl::AddProperties(const nsIParserNode& aNode,
           nameSpaceID = kNameSpaceID_None;  // ignore unknown prefix XXX is this correct?
         }
         GetNameSpaceURI(nameSpaceID, k);
-        PRUnichar *unicodeString;
+        const PRUnichar *unicodeString;
         attr->GetUnicode(&unicodeString);
         k.Append(unicodeString);
 
@@ -1228,7 +1228,7 @@ RDFContentSinkImpl::OpenObject(const nsIParserNode& aNode)
         // tag name. We can do this 'cause we don't need it anymore...
         nsAutoString typeStr;
         GetNameSpaceURI(nameSpaceID, typeStr);  // XXX append ':' too?
-        PRUnichar *unicodeString;
+        const PRUnichar *unicodeString;
         tag->GetUnicode(&unicodeString);
         typeStr.Append(unicodeString);
 
@@ -1267,7 +1267,7 @@ RDFContentSinkImpl::OpenProperty(const nsIParserNode& aNode)
 
     // destructively alter "ns" to contain the fully qualified tag
     // name. We can do this 'cause we don't need it anymore...
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     tag->GetUnicode(&unicodeString);
     ns.Append(unicodeString);
 
diff --git a/mozilla/rdf/content/src/nsRDFContentUtils.cpp b/mozilla/rdf/content/src/nsRDFContentUtils.cpp
index 3dba831b2a4..b5adaa9b3e0 100644
--- a/mozilla/rdf/content/src/nsRDFContentUtils.cpp
+++ b/mozilla/rdf/content/src/nsRDFContentUtils.cpp
@@ -342,7 +342,7 @@ nsRDFContentUtils::GetElementLogString(nsIContent* aElement, nsString& aResult)
             nsAutoString prefixStr;
             prefix->ToString(prefixStr);
             if (prefixStr.Length()) {
-                PRUnichar *unicodeString;
+                const PRUnichar *unicodeString;
                 prefix->GetUnicode(&unicodeString);
                 aResult.Append(unicodeString);
                 aResult.Append(':');
@@ -354,7 +354,7 @@ nsRDFContentUtils::GetElementLogString(nsIContent* aElement, nsString& aResult)
     rv = aElement->GetTag(*getter_AddRefs(tag));
     if (NS_FAILED(rv)) return rv;
 
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     tag->GetUnicode(&unicodeString);
     aResult.Append(unicodeString);
 
@@ -418,7 +418,7 @@ nsRDFContentUtils::GetAttributeLogString(nsIContent* aElement, PRInt32 aNameSpac
             nsAutoString prefixStr;
             prefix->ToString(prefixStr);
             if (prefixStr.Length()) {
-                PRUnichar *unicodeString;
+                const PRUnichar *unicodeString;
                 prefix->GetUnicode(&unicodeString);
                 aResult.Append(unicodeString);
                 aResult.Append(':');
@@ -426,7 +426,7 @@ nsRDFContentUtils::GetAttributeLogString(nsIContent* aElement, PRInt32 aNameSpac
         }
     }
 
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     aTag->GetUnicode(&unicodeString);
     aResult.Append(unicodeString);
     return NS_OK;
diff --git a/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp b/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp
index 84e27e4cddd..7405e2963a2 100644
--- a/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp
+++ b/mozilla/rdf/content/src/nsRDFGenericBuilder.cpp
@@ -893,7 +893,7 @@ RDFGenericBuilderImpl::CreateElement(PRInt32 aNameSpaceID,
 
     if (aNameSpaceID == kNameSpaceID_HTML) {
         nsCOMPtr<nsIHTMLContent> element;
-        /*const*/ PRUnichar *tagName;
+        const PRUnichar *tagName;
         aTag->GetUnicode(&tagName);
 
         rv = gHTMLElementFactory->CreateInstanceByTag(tagName, getter_AddRefs(element));
@@ -1579,7 +1579,7 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
         rv = aChild->GetValue(getter_Copies(resourceCStr));
         if (NS_FAILED(rv)) return rv;
         
-        PRUnichar *unicodeString;
+        const PRUnichar *unicodeString;
         tag->GetUnicode(&unicodeString);
         nsAutoString tagStr(unicodeString);
         char* tagCStr = tagStr.ToNewCString();
diff --git a/mozilla/rdf/content/src/nsRDFXULBuilder.cpp b/mozilla/rdf/content/src/nsRDFXULBuilder.cpp
index 0a04bba1aa1..2188f1f8f1c 100644
--- a/mozilla/rdf/content/src/nsRDFXULBuilder.cpp
+++ b/mozilla/rdf/content/src/nsRDFXULBuilder.cpp
@@ -1579,7 +1579,7 @@ RDFXULBuilderImpl::CreateHTMLElement(nsINameSpace* aContainingNameSpace,
     // bit of a hack: a bridge until we get to a more DOM-based
     // solution.
     nsCOMPtr<nsIHTMLContent> element;
-    /* const */ PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     aTagName->GetUnicode(&unicodeString);
     rv = mHTMLElementFactory->CreateInstanceByTag(unicodeString,
                                                   getter_AddRefs(element));
@@ -2389,7 +2389,7 @@ RDFXULBuilderImpl::GetResource(PRInt32 aNameSpaceID,
     gNameSpaceManager->GetNameSpaceURI(aNameSpaceID, uri);
 
     // XXX check to see if we need to insert a '/' or a '#'
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     aNameAtom->GetUnicode(&unicodeString);
     nsAutoString tag(unicodeString);
     if (0 < uri.Length() && uri.Last() != '#' && uri.Last() != '/' && tag.First() != '#')
@@ -2427,7 +2427,7 @@ RDFXULBuilderImpl::MakeProperty(PRInt32 aNameSpaceID, nsIAtom* aTagName, nsIRDFR
     if (uri.Last() != PRUnichar('#') && uri.Last() != PRUnichar('/'))
         uri.Append('#');
 
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     aTagName->GetUnicode(&unicodeString);
     uri.Append(unicodeString);
 
diff --git a/mozilla/rdf/content/src/nsXULAttributes.cpp b/mozilla/rdf/content/src/nsXULAttributes.cpp
index 6e7cef0dc84..6ee6513d8e9 100644
--- a/mozilla/rdf/content/src/nsXULAttributes.cpp
+++ b/mozilla/rdf/content/src/nsXULAttributes.cpp
@@ -126,7 +126,7 @@ nsXULAttribute::QueryInterface(REFNSIID aIID, void** aResult)
 NS_IMETHODIMP
 nsXULAttribute::GetNodeName(nsString& aNodeName)
 {
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     mName->GetUnicode(&unicodeString);
 
     aNodeName.SetString(unicodeString);
@@ -253,7 +253,7 @@ nsXULAttribute::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
 NS_IMETHODIMP
 nsXULAttribute::GetName(nsString& aName)
 {
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     mName->GetUnicode(&unicodeString);
     aName.SetString(unicodeString);
     return NS_OK;
@@ -340,14 +340,14 @@ nsXULAttribute::GetQualifiedName(nsString& aQualifiedName)
         rv = mContent->GetNameSpacePrefixFromId(mNameSpaceID, prefix);
 
         if (NS_SUCCEEDED(rv) && (prefix != nsnull)) {
-            PRUnichar *unicodeString;
+            const PRUnichar *unicodeString;
             prefix->GetUnicode(&unicodeString);
             aQualifiedName.Append(unicodeString);
             aQualifiedName.Append(':');
             NS_RELEASE(prefix);
         }
     }
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     mName->GetUnicode(&unicodeString);
     aQualifiedName.Append(unicodeString);
 }
diff --git a/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp b/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
index 84e27e4cddd..7405e2963a2 100644
--- a/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
+++ b/mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
@@ -893,7 +893,7 @@ RDFGenericBuilderImpl::CreateElement(PRInt32 aNameSpaceID,
 
     if (aNameSpaceID == kNameSpaceID_HTML) {
         nsCOMPtr<nsIHTMLContent> element;
-        /*const*/ PRUnichar *tagName;
+        const PRUnichar *tagName;
         aTag->GetUnicode(&tagName);
 
         rv = gHTMLElementFactory->CreateInstanceByTag(tagName, getter_AddRefs(element));
@@ -1579,7 +1579,7 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
         rv = aChild->GetValue(getter_Copies(resourceCStr));
         if (NS_FAILED(rv)) return rv;
         
-        PRUnichar *unicodeString;
+        const PRUnichar *unicodeString;
         tag->GetUnicode(&unicodeString);
         nsAutoString tagStr(unicodeString);
         char* tagCStr = tagStr.ToNewCString();
diff --git a/mozilla/rdf/datasource/src/nsXULContentSink.cpp b/mozilla/rdf/datasource/src/nsXULContentSink.cpp
index d2321427627..aa3b387ad05 100644
--- a/mozilla/rdf/datasource/src/nsXULContentSink.cpp
+++ b/mozilla/rdf/datasource/src/nsXULContentSink.cpp
@@ -346,7 +346,7 @@ XULContentSinkImpl::~XULContentSinkImpl()
                 nsAutoString prefix;
                 if (prefixAtom)
                 {
-                    PRUnichar *unicodeString;
+                    const PRUnichar *unicodeString;
                     prefixAtom->GetUnicode(&unicodeString);
                     prefix = unicodeString;
                 }
@@ -401,7 +401,7 @@ XULContentSinkImpl::~XULContentSinkImpl()
                             nsCOMPtr<nsIAtom> tagAtom;
                             rv = rdfDoc->SplitProperty(type, &nameSpaceID, getter_AddRefs(tagAtom));
                             if (NS_SUCCEEDED(rv)) {
-                                PRUnichar *unicodeString;
+                                const PRUnichar *unicodeString;
                                 tagAtom->GetUnicode(&unicodeString);
                                 tag = unicodeString;
                                 mNameSpaceManager->GetNameSpaceURI(nameSpaceID, nameSpaceURI);
diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index 1aab78a0e9b..dd1ed7214ae 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -1765,7 +1765,7 @@ PRBool nsString::Equals(/*FIX: const */nsIAtom* aAtom,PRBool aIgnoreCase) const{
   PRBool result=PR_FALSE;
   if(aAtom){
     PRInt32 cmp=0;
-    PRUnichar* unicode;
+    const PRUnichar* unicode;
     if (aAtom->GetUnicode(&unicode) != NS_OK || unicode == nsnull)
         return PR_FALSE;
     if (aIgnoreCase)
diff --git a/mozilla/xpcom/ds/nsAtomTable.cpp b/mozilla/xpcom/ds/nsAtomTable.cpp
index 30aee76df71..af3359f7fef 100644
--- a/mozilla/xpcom/ds/nsAtomTable.cpp
+++ b/mozilla/xpcom/ds/nsAtomTable.cpp
@@ -70,10 +70,10 @@ AtomImpl::ToString(nsString& aBuf) /*FIX: const */
 }
 
 NS_IMETHODIMP 
-AtomImpl::GetUnicode( PRUnichar** _retval ) /*FIX: const */
+AtomImpl::GetUnicode(const PRUnichar **aResult) /*FIX: const */
 {
-  NS_ENSURE_ARG_POINTER(_retval);
-  *_retval = mString;
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = mString;
   return NS_OK;
 }
 
diff --git a/mozilla/xpcom/ds/nsIAtom.idl b/mozilla/xpcom/ds/nsIAtom.idl
index 5085547de93..71aaaa2eaf8 100644
--- a/mozilla/xpcom/ds/nsIAtom.idl
+++ b/mozilla/xpcom/ds/nsIAtom.idl
@@ -43,7 +43,7 @@ interface nsIAtom : nsISupports
   /**
    * Return a pointer to a zero terminated unicode string.
    */
-  wstring GetUnicode();
+   void GetUnicode([shared, retval] out wstring aResult);
 
   /**
    * Get the size, in bytes, of the atom.
diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp
index 1aab78a0e9b..dd1ed7214ae 100644
--- a/mozilla/xpcom/ds/nsString2.cpp
+++ b/mozilla/xpcom/ds/nsString2.cpp
@@ -1765,7 +1765,7 @@ PRBool nsString::Equals(/*FIX: const */nsIAtom* aAtom,PRBool aIgnoreCase) const{
   PRBool result=PR_FALSE;
   if(aAtom){
     PRInt32 cmp=0;
-    PRUnichar* unicode;
+    const PRUnichar* unicode;
     if (aAtom->GetUnicode(&unicode) != NS_OK || unicode == nsnull)
         return PR_FALSE;
     if (aIgnoreCase)
diff --git a/mozilla/xpcom/proxy/src/nsProxyEvent.cpp b/mozilla/xpcom/proxy/src/nsProxyEvent.cpp
index 472f41ba056..1ba0106e800 100644
--- a/mozilla/xpcom/proxy/src/nsProxyEvent.cpp
+++ b/mozilla/xpcom/proxy/src/nsProxyEvent.cpp
@@ -141,6 +141,8 @@ nsProxyObject::Post( PRUint32 methodIndex, nsXPTMethodInfo *methodInfo, nsXPTCMi
         return NS_ERROR_OUT_OF_MEMORY;
 
   
+    if (methodInfo->IsNotXPCOM())
+        return NS_ERROR_PROXY_INVALID_IN_PARAMETER;
     ///////////////////////////////////////////////////////////////////////
     // Auto-proxification
     ///////////////////////////////////////////////////////////////////////
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index 1aab78a0e9b..dd1ed7214ae 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -1765,7 +1765,7 @@ PRBool nsString::Equals(/*FIX: const */nsIAtom* aAtom,PRBool aIgnoreCase) const{
   PRBool result=PR_FALSE;
   if(aAtom){
     PRInt32 cmp=0;
-    PRUnichar* unicode;
+    const PRUnichar* unicode;
     if (aAtom->GetUnicode(&unicode) != NS_OK || unicode == nsnull)
         return PR_FALSE;
     if (aIgnoreCase)
diff --git a/mozilla/xpcom/tests/TestAtoms.cpp b/mozilla/xpcom/tests/TestAtoms.cpp
index 3d61586b6c3..1230f01e4bd 100644
--- a/mozilla/xpcom/tests/TestAtoms.cpp
+++ b/mozilla/xpcom/tests/TestAtoms.cpp
@@ -60,7 +60,7 @@ int main(int argc, char** argv)
 
   // Now make sure we can find all the idents we just made
   for (i = 0; i < count; i++) {
-    PRUnichar *unicodeString;
+    const PRUnichar *unicodeString;
     ids[i]->GetUnicode(&unicodeString);
     nsIAtom* id = NS_NewAtom(unicodeString);
     if (id != ids[i]) {