mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-09-21 20:06:40 +00:00
Upgrade SpiderMonkey to ESR 115
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
|
||||
#if MSC_VERSION
|
||||
# pragma warning(push, 1)
|
||||
# pragma warning(disable: 4068)
|
||||
#endif
|
||||
#include "js/Promise.h"
|
||||
#if MSC_VERSION
|
||||
|
||||
@@ -38,6 +38,8 @@
|
||||
#if MSC_VERSION
|
||||
// reduce the warning level for the SpiderMonkey headers
|
||||
# pragma warning(push, 1)
|
||||
// ignore C4291 in <mozilla/Maybe.h>
|
||||
# pragma warning(disable: 4291)
|
||||
#endif
|
||||
|
||||
// Redefine signbit to fix build error in GCC
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
#if MSC_VERSION
|
||||
# pragma warning(push, 1)
|
||||
# pragma warning(disable: 4100)
|
||||
# pragma warning(disable: 4068)
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -496,8 +496,8 @@ void ScriptInterface::DefineCustomObjectType(JSClass *clasp, JSNative constructo
|
||||
}
|
||||
|
||||
JS::RootedObject global(rq.cx, rq.glob);
|
||||
JS::RootedObject obj(rq.cx, JS_InitClass(rq.cx, global, nullptr,
|
||||
clasp,
|
||||
JS::RootedObject obj(rq.cx, JS_InitClass(rq.cx, global,
|
||||
clasp, nullptr, clasp->name,
|
||||
constructor, minArgs, // Constructor, min args
|
||||
ps, fs, // Properties, methods
|
||||
static_ps, static_fs)); // Constructor properties, methods
|
||||
|
||||
@@ -61,6 +61,8 @@
|
||||
# pragma warning(push, 1)
|
||||
// ignore C4291 in <mozilla/Vector.h>
|
||||
# pragma warning(disable: 4291)
|
||||
// ignore C4068 in <mozilla/Casting.h>
|
||||
# pragma warning(disable: 4068)
|
||||
#endif
|
||||
|
||||
#include "jspubtd.h"
|
||||
@@ -77,7 +79,7 @@
|
||||
# pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
#if MOZJS_MAJOR_VERSION != 102
|
||||
#if MOZJS_MAJOR_VERSION != 115
|
||||
#error Your compiler is trying to use an incorrect major version of the \
|
||||
SpiderMonkey library. The only version that works is the one in the \
|
||||
libraries/spidermonkey/ directory, and it will not work with a typical \
|
||||
@@ -85,7 +87,7 @@ system-installed version. Make sure you have got all the right files and \
|
||||
include paths.
|
||||
#endif
|
||||
|
||||
#if MOZJS_MINOR_VERSION != 15
|
||||
#if MOZJS_MINOR_VERSION != 16
|
||||
#error Your compiler is trying to use an untested minor version of the \
|
||||
SpiderMonkey library. If you are a package maintainer, please make sure \
|
||||
to check very carefully that this version does not change the behaviour \
|
||||
|
||||
Reference in New Issue
Block a user