#76913

r=mstoltz, sr=brendan
Fix some calling convention - PR_ to JS_

caps/src/nsJSPrincipals.cpp

@@ -24,19 +24,19 @@
 #include "plstr.h"
 #include "nsXPIDLString.h"
 
-PR_STATIC_CALLBACK(void *) 
+JS_STATIC_DLL_CALLBACK(void *) 
 nsGetPrincipalArray(JSContext *cx, struct JSPrincipals *prin) 
 {
     return nsnull;
 }
 
-PR_STATIC_CALLBACK(JSBool) 
+JS_STATIC_DLL_CALLBACK(JSBool) 
 nsGlobalPrivilegesEnabled(JSContext *cx , struct JSPrincipals *jsprin) 
 {
     return JS_TRUE;
 }
 
-PR_STATIC_CALLBACK(void)
+JS_STATIC_DLL_CALLBACK(void)
 nsDestroyJSPrincipals(JSContext *cx, struct JSPrincipals *jsprin) {
     nsJSPrincipals *nsjsprin = (nsJSPrincipals *)jsprin;
     // We need to destroy the nsIPrincipal. We'll do this by adding

caps/src/nsScriptSecurityManager.cpp

@@ -181,7 +181,7 @@ getStringArgument(JSContext *cx, JSObject *obj, PRUint16 argNum, uintN argc, jsv
     return JS_GetStringBytes(str);
 }
 
-PR_STATIC_CALLBACK(JSBool)
+JS_STATIC_DLL_CALLBACK(JSBool)
 netscape_security_isPrivilegeEnabled(JSContext *cx, JSObject *obj, uintN argc,
                                      jsval *argv, jsval *rval)
 {
@@ -203,7 +203,7 @@ netscape_security_isPrivilegeEnabled(JSContext *cx, JSObject *obj, uintN argc,
 }
 
 
-PR_STATIC_CALLBACK(JSBool)
+JS_STATIC_DLL_CALLBACK(JSBool)
 netscape_security_enablePrivilege(JSContext *cx, JSObject *obj, uintN argc,
                                   jsval *argv, jsval *rval)
 {
@@ -221,7 +221,7 @@ netscape_security_enablePrivilege(JSContext *cx, JSObject *obj, uintN argc,
     return JS_TRUE;
 }
 
-PR_STATIC_CALLBACK(JSBool)
+JS_STATIC_DLL_CALLBACK(JSBool)
 netscape_security_disablePrivilege(JSContext *cx, JSObject *obj, uintN argc,
                                    jsval *argv, jsval *rval)
 {
@@ -239,7 +239,7 @@ netscape_security_disablePrivilege(JSContext *cx, JSObject *obj, uintN argc,
     return JS_TRUE;
 }
 
-PR_STATIC_CALLBACK(JSBool)
+JS_STATIC_DLL_CALLBACK(JSBool)
 netscape_security_revertPrivilege(JSContext *cx, JSObject *obj, uintN argc,
                                   jsval *argv, jsval *rval)
 {
@@ -257,7 +257,7 @@ netscape_security_revertPrivilege(JSContext *cx, JSObject *obj, uintN argc,
     return JS_TRUE;
 }
 
-PR_STATIC_CALLBACK(JSBool)
+JS_STATIC_DLL_CALLBACK(JSBool)
 netscape_security_setCanEnablePrivilege(JSContext *cx, JSObject *obj, uintN argc,
                                         jsval *argv, jsval *rval)
 {
@@ -278,7 +278,7 @@ netscape_security_setCanEnablePrivilege(JSContext *cx, JSObject *obj, uintN argc
     return JS_TRUE;
 }
 
-PR_STATIC_CALLBACK(JSBool)
+JS_STATIC_DLL_CALLBACK(JSBool)
 netscape_security_invalidate(JSContext *cx, JSObject *obj, uintN argc,
                              jsval *argv, jsval *rval)
 {