diff --git a/mozilla/content/base/public/nsIXMLHttpRequest.idl b/mozilla/content/base/public/nsIXMLHttpRequest.idl index 1b0580ff4b2..3a51a3f6331 100644 --- a/mozilla/content/base/public/nsIXMLHttpRequest.idl +++ b/mozilla/content/base/public/nsIXMLHttpRequest.idl @@ -27,9 +27,9 @@ interface nsIDOMEventListener; [scriptable, uuid(b7215e70-4157-11d4-9a42-000064657374)] interface nsIXMLHttpRequest : nsISupports { - noscript void addEventListener(in string type, + [noscript] void addEventListener(in string type, in nsIDOMEventListener listener); - noscript void removeEventListener(in string type, + [noscript] void removeEventListener(in string type, in nsIDOMEventListener listener); attribute nsISupports onload; attribute nsISupports onerror; @@ -40,7 +40,7 @@ interface nsIXMLHttpRequest : nsISupports { void abort(); string getAllResponseHeaders(); string getResponseHeader(in string header); - noscript void openRequest(in string method, + [noscript] void openRequest(in string method, in wstring url, in boolean async, in string user, diff --git a/mozilla/content/base/src/nsXMLHttpRequest.cpp b/mozilla/content/base/src/nsXMLHttpRequest.cpp index becb6eca4a6..89744cd9ac4 100644 --- a/mozilla/content/base/src/nsXMLHttpRequest.cpp +++ b/mozilla/content/base/src/nsXMLHttpRequest.cpp @@ -625,9 +625,9 @@ nsXMLHttpRequest::Open(const char *method, const PRUnichar *url) } if (argc > 2) { - JSBool bool; - JS_ValueToBoolean(cx, argv[2], &bool); - async = (PRBool)bool; + JSBool asyncBool; + JS_ValueToBoolean(cx, argv[2], &asyncBool); + async = (PRBool)asyncBool; if (argc > 3) { JSString* userStr;