From: Tobias Markus Date: Sat, 7 Mar 2015 13:27:21 +0000 (+0100) Subject: Another round of fixes for squirrel X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6148e5bb9c4c7c3c9af1a30fc5d86c0799a0be0d;p=supertux.git Another round of fixes for squirrel --- diff --git a/external/squirrel/patches/patch2.patch b/external/squirrel/patches/patch2.patch new file mode 100644 index 000000000..cadb341de --- /dev/null +++ b/external/squirrel/patches/patch2.patch @@ -0,0 +1,22 @@ +diff --git a/external/squirrel/squirrel/sqclosure.h b/external/squirrel/squirrel/sqclosure.h +index 07b3efc..dc108de 100644 +--- a/external/squirrel/squirrel/sqclosure.h ++++ b/external/squirrel/squirrel/sqclosure.h +@@ -10,7 +10,7 @@ struct SQClass; + struct SQClosure : public CHAINABLE_OBJ + { + private: +- SQClosure(SQSharedState *ss,SQFunctionProto *func){_function = func; __ObjAddRef(_function); _base = NULL; INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this); _env = NULL;} ++ SQClosure(SQSharedState *ss,SQFunctionProto *func): _outervalues(NULL), _defaultparams(NULL) {_function = func; __ObjAddRef(_function); _base = NULL; INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this); _env = NULL;} + public: + static SQClosure *Create(SQSharedState *ss,SQFunctionProto *func){ + SQInteger size = _CALC_CLOSURE_SIZE(func); +@@ -139,7 +139,7 @@ public: + struct SQNativeClosure : public CHAINABLE_OBJ + { + private: +- SQNativeClosure(SQSharedState *ss,SQFUNCTION func){_function=func;INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this); _env = NULL;} ++ SQNativeClosure(SQSharedState *ss,SQFUNCTION func): _nparamscheck(0), _outervalues(NULL), _noutervalues(0){_function=func;INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this); _env = NULL;} + public: + static SQNativeClosure *Create(SQSharedState *ss,SQFUNCTION func,SQInteger nouters) + {