diff --git a/mozilla/js/ref/jsfun.c b/mozilla/js/ref/jsfun.c
index 820dcd9d532..e71a241d6bb 100644
--- a/mozilla/js/ref/jsfun.c
+++ b/mozilla/js/ref/jsfun.c
@@ -1025,7 +1025,7 @@ fun_xdrObject(JSXDRState *xdr, JSObject **objp)
 		propname = ATOM_BYTES(sym_atom(sprop->symbols));
                 propid = sprop->id;
 		if (!JS_XDRUint32(xdr, &type) ||
-                    !JS_XDRUint32(xdr, &propid) ||
+                    !JS_XDRUint32(xdr, (uint32 *)&propid) ||
 		    !JS_XDRCString(xdr, &propname))
 		    return JS_FALSE;
 	    }
@@ -1035,7 +1035,7 @@ fun_xdrObject(JSXDRState *xdr, JSObject **objp)
 	    i = fun->nvars + fun->nargs;
 	    while (i--) {
 		if (!JS_XDRUint32(xdr, &type) ||
-                    !JS_XDRUint32(xdr, &propid) ||
+                    !JS_XDRUint32(xdr, (uint32 *)&propid) ||
 		    !JS_XDRCString(xdr, &propname))
 		    return JS_FALSE;
 		PR_ASSERT(type == JSXDR_FUNARG || type == JSXDR_FUNVAR);
diff --git a/mozilla/js/ref/jsnum.c b/mozilla/js/ref/jsnum.c
index de3d69ba7fd..990a3282ecb 100644
--- a/mozilla/js/ref/jsnum.c
+++ b/mozilla/js/ref/jsnum.c
@@ -117,7 +117,7 @@ num_parseInt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
     while (JS_ISSPACE(*chars) && *chars != 0)
         chars++;
 
-    if ((negative = (*chars == '-')) || *chars == '+')
+    if ((negative = (*chars == '-')) != 0 || *chars == '+')
         chars++;
 
     if (argc > 1) {