Bug 222524 CompareRawSortKey should be null-safe r=smontagu sr=bienvenu

intl/locale/src/mac/nsCollationMac.h

@@ -55,7 +55,7 @@ public:
   NS_IMETHOD CompareRawSortKey(const PRUint8* key1, const PRUint32 len1, 
                                const PRUint8* key2, const PRUint32 len2, 
                                PRInt32* result) 
-                               {*result = strcmp((const char *)key1, (const char *)key2); return NS_OK;}
+                               {*result = PL_strcmp((const char *)key1, (const char *)key2); return NS_OK;}
 
   // init this interface to a specified locale (should only be called by collation factory)
   //

intl/locale/src/os2/nsCollationOS2.h

@@ -51,7 +51,7 @@ public:
   NS_IMETHOD CompareRawSortKey(const PRUint8* key1, const PRUint32 len1, 
                                const PRUint8* key2, const PRUint32 len2, 
                                PRInt32* result) 
-                               {*result = UniStrcmp((UniChar *)key1, (UniChar *)key2); return NS_OK;}
+                               {*result = nsCRT::strcmp((PRUnichar *)key1, (PRUnichar *)key2); return NS_OK;}
    
   // init this interface to a specified locale (should only be called by collation factory)
   //

intl/locale/src/unix/nsCollationUnix.h

@@ -62,7 +62,7 @@ public:
   NS_IMETHOD CompareRawSortKey(const PRUint8* key1, const PRUint32 len1, 
                                const PRUint8* key2, const PRUint32 len2, 
                                PRInt32* result) 
-                               {*result = strcmp((const char *)key1, (const char *)key2); return NS_OK;}
+                               {*result = PL_strcmp((const char *)key1, (const char *)key2); return NS_OK;}
 
   // init this interface to a specified locale (should only be called by collation factory)
   //

intl/locale/src/windows/nsCollationWin.h

@@ -54,7 +54,7 @@ public:
   NS_IMETHOD CompareRawSortKey(const PRUint8* key1, const PRUint32 len1, 
                                const PRUint8* key2, const PRUint32 len2, 
                                PRInt32* result)
-                               {*result = strcmp((const char *)key1, (const char *)key2); return NS_OK;}
+                               {*result = PL_strcmp((const char *)key1, (const char *)key2); return NS_OK;}
 
   // init this interface to a specified locale (should only be called by collation factory)
   //