diff --git a/mozilla/string/obsolete/nsStr.cpp b/mozilla/string/obsolete/nsStr.cpp
index 44b176bc6d1..609e6bb57f3 100644
--- a/mozilla/string/obsolete/nsStr.cpp
+++ b/mozilla/string/obsolete/nsStr.cpp
@@ -468,7 +468,7 @@ void nsStrPrivate::Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,P
 
     if(aEliminateLeading) {
       while(++theIndex<=theMax) {
-        PRUnichar theChar=GetCharAt(aDest, theIndex);
+        PRUnichar theChar=::GetCharAt(aDest, theIndex);
         PRInt32 thePos=::FindChar1(aSet,theSetLen,0,theChar,PR_FALSE,theSetLen);
         if(kNotFound==thePos)
           break;
@@ -489,7 +489,7 @@ void nsStrPrivate::Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,P
       theIndex=aDest.mLength;
       PRInt32 theNewLen=theIndex;
       while(--theIndex>=0) {
-        PRUnichar theChar=GetCharAt(aDest, theIndex);  //read at end now...
+        PRUnichar theChar=::GetCharAt(aDest, theIndex);  //read at end now...
         PRInt32 thePos=::FindChar1(aSet,theSetLen,0,theChar,PR_FALSE,theSetLen);
         if(kNotFound<thePos) 
           theNewLen=theIndex;
diff --git a/mozilla/xpcom/string/obsolete/nsStr.cpp b/mozilla/xpcom/string/obsolete/nsStr.cpp
index 44b176bc6d1..609e6bb57f3 100644
--- a/mozilla/xpcom/string/obsolete/nsStr.cpp
+++ b/mozilla/xpcom/string/obsolete/nsStr.cpp
@@ -468,7 +468,7 @@ void nsStrPrivate::Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,P
 
     if(aEliminateLeading) {
       while(++theIndex<=theMax) {
-        PRUnichar theChar=GetCharAt(aDest, theIndex);
+        PRUnichar theChar=::GetCharAt(aDest, theIndex);
         PRInt32 thePos=::FindChar1(aSet,theSetLen,0,theChar,PR_FALSE,theSetLen);
         if(kNotFound==thePos)
           break;
@@ -489,7 +489,7 @@ void nsStrPrivate::Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,P
       theIndex=aDest.mLength;
       PRInt32 theNewLen=theIndex;
       while(--theIndex>=0) {
-        PRUnichar theChar=GetCharAt(aDest, theIndex);  //read at end now...
+        PRUnichar theChar=::GetCharAt(aDest, theIndex);  //read at end now...
         PRInt32 thePos=::FindChar1(aSet,theSetLen,0,theChar,PR_FALSE,theSetLen);
         if(kNotFound<thePos) 
           theNewLen=theIndex;