From 85bfc630f5d316288a3c3c26f3691fdaa9a74cea Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Thu, 10 Apr 2014 18:02:01 -0700 Subject: [PATCH] Fix accidental shadowing of js_GetErrorMessage --- glue.rs | 4 ++-- jsglue.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glue.rs b/glue.rs index aa6709ada..6bd36b5a3 100644 --- a/glue.rs +++ b/glue.rs @@ -95,8 +95,8 @@ pub fn DefineFunctionWithReserved(cx: *JSContext, obj: *JSObject, name: *libc::c_char, call: JSNative, nargs: libc::c_uint, attrs: libc::c_uint) -> *JSObject; pub fn GetObjectJSClass(obj: *JSObject) -> *JSClass; -pub fn js_GetErrorMessage(userRef: *libc::c_void, locale: *libc::c_char, - errorNumber: libc::c_uint) -> *JSErrorFormatString; +pub fn RUST_js_GetErrorMessage(userRef: *libc::c_void, locale: *libc::c_char, + errorNumber: libc::c_uint) -> *JSErrorFormatString; pub fn js_IsObjectProxyClass(obj: *JSObject) -> bool; pub fn js_IsFunctionProxyClass(obj: *JSObject) -> bool; pub fn IsProxyHandlerFamily(obj: *JSObject) -> bool; diff --git a/jsglue.cpp b/jsglue.cpp index 79a8d61e6..9955a8703 100644 --- a/jsglue.cpp +++ b/jsglue.cpp @@ -406,8 +406,8 @@ GetObjectJSClass(JSObject* obj) return js::GetObjectJSClass(obj); } -JSErrorFormatString* -js_GetErrorMessage(void* userRef, char* locale, uint32_t errorNumber) +const JSErrorFormatString* +RUST_js_GetErrorMessage(void* userRef, char* locale, uint32_t errorNumber) { return js_GetErrorMessage(userRef, locale, errorNumber); }