diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-02 15:48:44 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-02 15:48:44 +0200 |
| commit | 72658c2308ab6c5ec52a590f6c7b9a2b389b7f29 (patch) | |
| tree | b949e009e881cbc19e64debea1068c56952b4b44 /community/supertux/supertux2-0.3.3-squirrel-gcc47.patch | |
| parent | 04770005a02cc2a41550a57143af22c9d951bf6f (diff) | |
| parent | f003ac1c96d76f4e3a2b93f988e1effce6771052 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/tp_smapi/PKGBUILD
community/fish/PKGBUILD
community/supertux/PKGBUILD
extra/gvfs/PKGBUILD
multilib/wine/PKGBUILD
testing/e2fsprogs/PKGBUILD
testing/iptables/PKGBUILD
testing/krb5/PKGBUILD
testing/lm_sensors/PKGBUILD
testing/lm_sensors/healthd
testing/lm_sensors/healthd.rc
Diffstat (limited to 'community/supertux/supertux2-0.3.3-squirrel-gcc47.patch')
| -rw-r--r-- | community/supertux/supertux2-0.3.3-squirrel-gcc47.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch b/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch new file mode 100644 index 000000000..16781b610 --- /dev/null +++ b/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch @@ -0,0 +1,36 @@ +diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h +--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h 1970-01-01 01:00:00.000000000 +0100 ++++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h 2012-05-01 11:59:37.000000000 +0200 +@@ -0,0 +1,8 @@ ++/* see copyright notice in squirrel.h */ ++#ifndef _SQMEM_H_ ++#define _SQMEM_H_ ++ ++void *sq_vm_malloc(SQUnsignedInteger size); ++void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size); ++void sq_vm_free(void *p,SQUnsignedInteger size); ++#endif //_SQMEM_H_ +diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h +--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h 2010-03-01 13:40:58.000000000 +0100 ++++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h 2012-05-01 11:59:37.000000000 +0200 +@@ -136,8 +136,4 @@ + extern SQObjectPtr _minusone_; + + bool CompileTypemask(SQIntVec &res,const SQChar *typemask); +- +-void *sq_vm_malloc(SQUnsignedInteger size); +-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size); +-void sq_vm_free(void *p,SQUnsignedInteger size); + #endif //_SQSTATE_H_ +diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h +--- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h 2010-03-01 13:40:58.000000000 +0100 ++++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h 2012-05-01 11:59:37.000000000 +0200 +@@ -2,6 +2,8 @@ + #ifndef _SQUTILS_H_ + #define _SQUTILS_H_ + ++#include "sqmem.h" ++ + #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;} + #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));} + #define SQ_MALLOC(__size) sq_vm_malloc((__size)); |