import changes from rmottola/Arctic-Fox:

- change some pointer style, or patches do not apply (0de8fac13)
- Bug 1137523 - Unprefix most js_* functions. (16507a434)
This commit is contained in:
2019-01-29 10:29:22 +08:00
parent 8ea0072acd
commit 9f3e30f71b
154 changed files with 1181 additions and 1265 deletions
+3 -3
View File
@@ -580,7 +580,7 @@ CompileError::throwError(JSContext* cx)
// as the non-top-level "load", "eval", or "compile" native function
// returns false, the top-level reporter will eventually receive the
// uncaught exception report.
if (!js_ErrorToException(cx, message, &report, nullptr, nullptr))
if (!ErrorToException(cx, message, &report, nullptr, nullptr))
CallErrorReporter(cx, message, &report);
}
@@ -648,8 +648,8 @@ TokenStream::reportCompileErrorNumberVA(uint32_t offset, unsigned flags, unsigne
err.argumentsType = (flags & JSREPORT_UC) ? ArgumentsAreUnicode : ArgumentsAreASCII;
if (!js_ExpandErrorArguments(cx, js_GetErrorMessage, nullptr, errorNumber, &err.message,
&err.report, err.argumentsType, args))
if (!ExpandErrorArguments(cx, GetErrorMessage, nullptr, errorNumber, &err.message,
&err.report, err.argumentsType, args))
{
return false;
}