add a few more string cases to fix compilers who complain about ambiguous overloading

base/src/nsCRT.h

@@ -86,6 +86,10 @@ public:
     return PRInt32(PL_strncasecmp(s1, s2, aMaxLen));
   }
 
+  static PRInt32 strncmp(const char* s1, const char* s2, PRInt32 aMaxLen) {
+    return PRInt32(PL_strncmp(s1,s2,aMaxLen));
+  }
+  
   static char* strdup(const char* str) {
     return PL_strdup(str);
   }

base/src/nsString.cpp

@@ -1775,6 +1775,7 @@ PRInt32 nsString::Compare(const PRUnichar* aString,PRBool aIgnoreCase,PRInt32 aL
 PRBool nsString::operator==(const nsString &S) const {return Equals(S);}      
 PRBool nsString::operator==(const char *s) const {return Equals(s);}
 PRBool nsString::operator==(const PRUnichar *s) const {return Equals(s);}
+PRBool nsString::operator==(PRUnichar *s) const {return Equals(s);}
 PRBool nsString::operator!=(const nsString &S) const {return PRBool(Compare(S)!=0);}
 PRBool nsString::operator!=(const char *s) const {return PRBool(Compare(s)!=0);}
 PRBool nsString::operator!=(const PRUnichar *s) const {return PRBool(Compare(s)!=0);}

base/src/nsString.h

@@ -648,6 +648,7 @@ virtual PRInt32 Compare(const PRUnichar *aString,PRBool aIgnoreCase=PR_FALSE,PRI
 PRBool  operator==(const nsString &aString) const;
 PRBool  operator==(const char *aString) const;
 PRBool  operator==(const PRUnichar* aString) const;
+PRBool  operator==(PRUnichar* aString) const;
 
 /**
  * These methods perform a !compare of a given string type to this 

string/obsolete/nsString.cpp

@@ -1775,6 +1775,7 @@ PRInt32 nsString::Compare(const PRUnichar* aString,PRBool aIgnoreCase,PRInt32 aL
 PRBool nsString::operator==(const nsString &S) const {return Equals(S);}      
 PRBool nsString::operator==(const char *s) const {return Equals(s);}
 PRBool nsString::operator==(const PRUnichar *s) const {return Equals(s);}
+PRBool nsString::operator==(PRUnichar *s) const {return Equals(s);}
 PRBool nsString::operator!=(const nsString &S) const {return PRBool(Compare(S)!=0);}
 PRBool nsString::operator!=(const char *s) const {return PRBool(Compare(s)!=0);}
 PRBool nsString::operator!=(const PRUnichar *s) const {return PRBool(Compare(s)!=0);}

string/obsolete/nsString.h

@@ -648,6 +648,7 @@ virtual PRInt32 Compare(const PRUnichar *aString,PRBool aIgnoreCase=PR_FALSE,PRI
 PRBool  operator==(const nsString &aString) const;
 PRBool  operator==(const char *aString) const;
 PRBool  operator==(const PRUnichar* aString) const;
+PRBool  operator==(PRUnichar* aString) const;
 
 /**
  * These methods perform a !compare of a given string type to this 

xpcom/ds/nsCRT.h

@@ -86,6 +86,10 @@ public:
     return PRInt32(PL_strncasecmp(s1, s2, aMaxLen));
   }
 
+  static PRInt32 strncmp(const char* s1, const char* s2, PRInt32 aMaxLen) {
+    return PRInt32(PL_strncmp(s1,s2,aMaxLen));
+  }
+  
   static char* strdup(const char* str) {
     return PL_strdup(str);
   }

xpcom/ds/nsString.cpp

@@ -1775,6 +1775,7 @@ PRInt32 nsString::Compare(const PRUnichar* aString,PRBool aIgnoreCase,PRInt32 aL
 PRBool nsString::operator==(const nsString &S) const {return Equals(S);}      
 PRBool nsString::operator==(const char *s) const {return Equals(s);}
 PRBool nsString::operator==(const PRUnichar *s) const {return Equals(s);}
+PRBool nsString::operator==(PRUnichar *s) const {return Equals(s);}
 PRBool nsString::operator!=(const nsString &S) const {return PRBool(Compare(S)!=0);}
 PRBool nsString::operator!=(const char *s) const {return PRBool(Compare(s)!=0);}
 PRBool nsString::operator!=(const PRUnichar *s) const {return PRBool(Compare(s)!=0);}

xpcom/ds/nsString.h

@@ -648,6 +648,7 @@ virtual PRInt32 Compare(const PRUnichar *aString,PRBool aIgnoreCase=PR_FALSE,PRI
 PRBool  operator==(const nsString &aString) const;
 PRBool  operator==(const char *aString) const;
 PRBool  operator==(const PRUnichar* aString) const;
+PRBool  operator==(PRUnichar* aString) const;
 
 /**
  * These methods perform a !compare of a given string type to this 

xpcom/string/obsolete/nsString.cpp

@@ -1775,6 +1775,7 @@ PRInt32 nsString::Compare(const PRUnichar* aString,PRBool aIgnoreCase,PRInt32 aL
 PRBool nsString::operator==(const nsString &S) const {return Equals(S);}      
 PRBool nsString::operator==(const char *s) const {return Equals(s);}
 PRBool nsString::operator==(const PRUnichar *s) const {return Equals(s);}
+PRBool nsString::operator==(PRUnichar *s) const {return Equals(s);}
 PRBool nsString::operator!=(const nsString &S) const {return PRBool(Compare(S)!=0);}
 PRBool nsString::operator!=(const char *s) const {return PRBool(Compare(s)!=0);}
 PRBool nsString::operator!=(const PRUnichar *s) const {return PRBool(Compare(s)!=0);}

xpcom/string/obsolete/nsString.h

@@ -648,6 +648,7 @@ virtual PRInt32 Compare(const PRUnichar *aString,PRBool aIgnoreCase=PR_FALSE,PRI
 PRBool  operator==(const nsString &aString) const;
 PRBool  operator==(const char *aString) const;
 PRBool  operator==(const PRUnichar* aString) const;
+PRBool  operator==(PRUnichar* aString) const;
 
 /**
  * These methods perform a !compare of a given string type to this