From 609d519d3d4decd9a2ed661627c8aab16b4f329f Mon Sep 17 00:00:00 2001 From: olsner Date: Wed, 9 Jun 2004 14:02:40 +0000 Subject: [PATCH] GCC/linux compat (required extern qualifier, int/JSInt32 conversion) This was SVN commit r447. --- source/scripting/ScriptGlue.h | 2 +- source/scripting/ScriptingHost.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/scripting/ScriptGlue.h b/source/scripting/ScriptGlue.h index 140ccbf584..1cd25886a5 100755 --- a/source/scripting/ScriptGlue.h +++ b/source/scripting/ScriptGlue.h @@ -6,6 +6,6 @@ JSBool WriteLog(JSContext * context, JSObject * globalObject, unsigned int argc, jsval *argv, jsval *rval); -JSFunctionSpec ScriptFunctionTable[]; +extern JSFunctionSpec ScriptFunctionTable[]; #endif diff --git a/source/scripting/ScriptingHost.cpp b/source/scripting/ScriptingHost.cpp index 375cd265f7..a82e8db295 100755 --- a/source/scripting/ScriptingHost.cpp +++ b/source/scripting/ScriptingHost.cpp @@ -225,9 +225,9 @@ void ScriptingHost::SetObjectProperty(JSObject * object, const std::string & pro int ScriptingHost::ValueToInt(const jsval value) { - int i = 0; + JSInt32 i = 0; - JSBool ok = JS_ValueToInt32(m_Context, value, (int32*)&i); + JSBool ok = JS_ValueToInt32(m_Context, value, (JSInt32*)&i); if (ok == JS_FALSE) {