diff --git a/mozilla/htmlparser/src/nsHTMLTags.cpp b/mozilla/htmlparser/src/nsHTMLTags.cpp
index d5c7c5978f7..c21b7ed31a7 100644
--- a/mozilla/htmlparser/src/nsHTMLTags.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTags.cpp
@@ -294,7 +294,7 @@ static PRInt32 gTableRefCount;
 static PLHashTable* gTagTable;
 
 
-static PLHashNumber
+PR_STATIC_CALLBACK(PLHashNumber)
 HTMLTagsHashCodeUCPtr(const void *key)
 {
   const PRUnichar *str = (const PRUnichar *)key;
@@ -302,7 +302,7 @@ HTMLTagsHashCodeUCPtr(const void *key)
   return nsCRT::HashCode(str);
 }
 
-static PRIntn
+PR_STATIC_CALLBACK(PRIntn)
 HTMLTagsKeyCompareUCPtr(const void *key1, const void *key2)
 {
   const PRUnichar *str1 = (const PRUnichar *)key1;
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
index d5c7c5978f7..c21b7ed31a7 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
@@ -294,7 +294,7 @@ static PRInt32 gTableRefCount;
 static PLHashTable* gTagTable;
 
 
-static PLHashNumber
+PR_STATIC_CALLBACK(PLHashNumber)
 HTMLTagsHashCodeUCPtr(const void *key)
 {
   const PRUnichar *str = (const PRUnichar *)key;
@@ -302,7 +302,7 @@ HTMLTagsHashCodeUCPtr(const void *key)
   return nsCRT::HashCode(str);
 }
 
-static PRIntn
+PR_STATIC_CALLBACK(PRIntn)
 HTMLTagsKeyCompareUCPtr(const void *key1, const void *key2)
 {
   const PRUnichar *str1 = (const PRUnichar *)key1;