diff --git a/mozilla/js/src/jsdate.c b/mozilla/js/src/jsdate.c
index 567717c29c4..16b19e03e0f 100644
--- a/mozilla/js/src/jsdate.c
+++ b/mozilla/js/src/jsdate.c
@@ -439,7 +439,7 @@ MakeDay(jsdouble year, jsdouble month, jsdouble date)
  */
 
 static JSClass date_class = {
-    js_Date_str,
+    (char *)js_Date_str,
     JSCLASS_HAS_PRIVATE,
     JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
     JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub,
diff --git a/mozilla/js/src/jsfun.c b/mozilla/js/src/jsfun.c
index c79259fc4f1..484957b6954 100644
--- a/mozilla/js/src/jsfun.c
+++ b/mozilla/js/src/jsfun.c
@@ -254,7 +254,7 @@ args_enumerate(JSContext *cx, JSObject *obj)
 }
 
 JSClass js_ArgumentsClass = {
-    js_Arguments_str,
+    (char *)js_Arguments_str,
     JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE,
     JS_PropertyStub,  JS_PropertyStub,
     args_getProperty, args_setProperty,
@@ -578,7 +578,7 @@ call_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
 }
 
 JSClass js_CallClass = {
-    js_Call_str,
+    (char *)js_Call_str,
     JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE,
     JS_PropertyStub,  JS_PropertyStub,
     call_getProperty, call_setProperty,
@@ -1044,7 +1044,7 @@ fun_hasInstance(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
 #endif /* !JS_HAS_INSTANCEOF */
 
 JSClass js_FunctionClass = {
-    js_Function_str,
+    (char *)js_Function_str,
     JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE,
     JS_PropertyStub,  fun_delProperty,
     fun_getProperty,  JS_PropertyStub,
diff --git a/mozilla/js/src/jsobj.c b/mozilla/js/src/jsobj.c
index 1d7aabdb081..0c1b021dcc8 100644
--- a/mozilla/js/src/jsobj.c
+++ b/mozilla/js/src/jsobj.c
@@ -99,7 +99,7 @@ JS_FRIEND_DATA(JSObjectOps) js_ObjectOps = {
 #endif
 
 JSClass js_ObjectClass = {
-    js_Object_str,
+    (char *)js_Object_str,
     0,
     JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
     JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub,
diff --git a/mozilla/js/src/jsregexp.c b/mozilla/js/src/jsregexp.c
index e09f2257743..b4c8500c62f 100644
--- a/mozilla/js/src/jsregexp.c
+++ b/mozilla/js/src/jsregexp.c
@@ -2483,7 +2483,7 @@ regexp_xdrObject(JSXDRState *xdr, JSObject **objp)
 #endif /* !JS_HAS_XDR */
 
 JSClass js_RegExpClass = {
-    js_RegExp_str,
+    (char *)js_RegExp_str,
     JSCLASS_HAS_PRIVATE,
     JS_PropertyStub,  JS_PropertyStub,  regexp_getProperty, regexp_setProperty,
     JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,     regexp_finalize,
diff --git a/mozilla/js/src/jsscript.c b/mozilla/js/src/jsscript.c
index b0147b7749c..e6b7c075d56 100644
--- a/mozilla/js/src/jsscript.c
+++ b/mozilla/js/src/jsscript.c
@@ -623,7 +623,7 @@ script_call(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 }
 
 JS_FRIEND_DATA(JSClass) js_ScriptClass = {
-    js_Script_str,
+    (char *)js_Script_str,
     JSCLASS_HAS_PRIVATE,
     JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
     JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   script_finalize,
diff --git a/mozilla/js/src/jsstr.c b/mozilla/js/src/jsstr.c
index 4c365abcd22..bb228a67e68 100644
--- a/mozilla/js/src/jsstr.c
+++ b/mozilla/js/src/jsstr.c
@@ -383,7 +383,7 @@ str_resolve(JSContext *cx, JSObject *obj, jsval id)
 }
 
 static JSClass string_class = {
-    js_String_str,
+    (char *)js_String_str,
     JSCLASS_HAS_PRIVATE,
     JS_PropertyStub,  str_delProperty,  str_getProperty,  JS_PropertyStub,
     str_enumerate,    str_resolve,      JS_ConvertStub,   JS_FinalizeStub,