diff --git a/mozilla/gfx/src/nsDeviceContext.cpp b/mozilla/gfx/src/nsDeviceContext.cpp
index 1fffa32aee2..0968d767dc9 100644
--- a/mozilla/gfx/src/nsDeviceContext.cpp
+++ b/mozilla/gfx/src/nsDeviceContext.cpp
@@ -449,7 +449,7 @@ public:
 PRUint32 FontAliasKey::HashValue(void) const
 {
   PRUint32 hash = 0;
-  PRUnichar* string = mString;
+  const PRUnichar* string = mString;
   PRUnichar ch;
   while ((ch = *string++) != 0) {
     // FYI: hash = hash*37 + ch
diff --git a/mozilla/gfx/src/nsFont.cpp b/mozilla/gfx/src/nsFont.cpp
index 0a789c256e3..ccd3c3b7b0c 100644
--- a/mozilla/gfx/src/nsFont.cpp
+++ b/mozilla/gfx/src/nsFont.cpp
@@ -103,7 +103,8 @@ PRBool nsFont::EnumerateFamilies(nsFontFamilyEnumFunc aFunc, void* aData) const
 
   familyList.Append(kNullCh);  // put an extra null at the end
 
-  PRUnichar* start = (PRUnichar*)familyList;
+  // XXX This code is evil...
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)familyList;
   PRUnichar* end   = start;
 
   while (running && (kNullCh != *start)) {