X-Git-Url: https://git.octo.it/?p=supertux.git;a=blobdiff_plain;f=external%2Fsquirrel%2Fpatches%2Fpatch2.patch;h=21133bbff6ad4b26b7d99e9ccfa62a90abf4b6b4;hp=cadb341de7885f090c7b78743e3415955ee5cf47;hb=1865f1fe066742c0f23e3958cdcbc5a0906116e9;hpb=544cd30d6eb553d547eba43f3452a88da48d2501 diff --git a/external/squirrel/patches/patch2.patch b/external/squirrel/patches/patch2.patch index cadb341de..21133bbff 100644 --- a/external/squirrel/patches/patch2.patch +++ b/external/squirrel/patches/patch2.patch @@ -2,21 +2,21 @@ diff --git a/external/squirrel/squirrel/sqclosure.h b/external/squirrel/squirrel 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) - { +@@ -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) + {