Squirrel patches can be applied again.

[supertux.git] / external / squirrel / patches / patch2.patch

diff --git a/external/squirrel/patches/patch2.patch b/external/squirrel/patches/patch2.patch
index cadb341..21133bb 100644 (file)
--- 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;\r
+ struct SQClosure : public CHAINABLE_OBJ\r
+ {\r
+ private:\r
+-      SQClosure(SQSharedState *ss,SQFunctionProto *func){_function = func; __ObjAddRef(_function); _base = NULL; INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this); _env = NULL;}\r
++    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;}\r
+ public:\r
+       static SQClosure *Create(SQSharedState *ss,SQFunctionProto *func){\r
+               SQInteger size = _CALC_CLOSURE_SIZE(func);\r
+@@ -139,7 +139,7 @@ public:\r
+ struct SQNativeClosure : public CHAINABLE_OBJ\r
+ {\r
+ private:\r
+-      SQNativeClosure(SQSharedState *ss,SQFUNCTION func){_function=func;INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this); _env = NULL;}\r
++      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;}\r
+ public:\r
+       static SQNativeClosure *Create(SQSharedState *ss,SQFUNCTION func,SQInteger nouters)\r
+       {\r