Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SpiderMonkey to m-c bcf4ff0c3eef. #279

Merged
merged 1 commit into from Jul 28, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Update SpiderMonkey.

Thanks to Anthony Ramine for generating the OSX and 32-bit Linux bindings.

Thanks to Vladimir Vukicevic for generating the Windows bindings.
  • Loading branch information
Ms2ger committed Jul 26, 2016
commit 2b0e6311cbdfbdf44520707bf15e4d6e99f2d938
@@ -13,7 +13,8 @@ endif
CFLAGS += -std=c++11 -DJS_NO_JSVAL_JSID_STRUCT_TYPES

ifneq ("$(MSYSTEM)","")
OUT_DIR := $(shell cygpath "$(OUT_DIR)")
OUT_DIR := $(shell cygpath -m "$(OUT_DIR)")
DEP_MOZJS_OUTDIR := $(shell cygpath -m "$(DEP_MOZJS_OUTDIR)")
else # not msys/mingw64
CFLAGS += -fPIC
endif
@@ -7,7 +7,6 @@ use jsapi::{JSCLASS_RESERVED_SLOTS_WIDTH, JSProtoKey};
use libc::c_uint;

pub const default_heapsize: u32 = 32_u32 * 1024_u32 * 1024_u32;
pub const default_stacksize: usize = 8192;

pub const JSCLASS_IS_DOMJSCLASS: c_uint = 1 << 4;
pub const JSCLASS_USERBIT1: c_uint = 1 << 7;
@@ -44,6 +44,12 @@ pub struct ProxyTraps {
proxy: HandleObject,
objp: MutableHandleObject)
-> bool>,
pub getPrototypeIfOrdinary: ::std::option::Option<unsafe extern "C" fn
(cx: *mut JSContext,
proxy: HandleObject,
isOrdinary: *mut bool,
protop: MutableHandleObject)
-> bool>,
pub preventExtensions: ::std::option::Option<unsafe extern "C" fn
(cx: *mut JSContext,
proxy: HandleObject,
@@ -108,7 +114,7 @@ pub struct ProxyTraps {
bp: *mut bool) -> bool>,
pub objectClassIs: ::std::option::Option<unsafe extern "C" fn
(obj: HandleObject,
classValue: ESClassValue,
classValue: ESClass,
cx: *mut JSContext) -> bool>,
pub className: ::std::option::Option<unsafe extern "C" fn
(cx: *mut JSContext,
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.