aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarino <marino@FreeBSD.org>2013-11-02 21:42:25 +0800
committermarino <marino@FreeBSD.org>2013-11-02 21:42:25 +0800
commitdf2072f5c6b006dd8240a5867e5a682369eee263 (patch)
treede5a6b4df65324f76440a0d3b7316b0706eedd6c
parent8c2babcc639751aef73477ea04f790d878b3e5f4 (diff)
downloadfreebsd-ports-gnome-df2072f5c6b006dd8240a5867e5a682369eee263.tar.gz
freebsd-ports-gnome-df2072f5c6b006dd8240a5867e5a682369eee263.tar.zst
freebsd-ports-gnome-df2072f5c6b006dd8240a5867e5a682369eee263.zip
games/scourge: Fix C++ -fpermissive errors seen on gcc 4.6+
Approved by: portmgr (bapt, implicit)
-rw-r--r--games/scourge/files/patch-src_squirrel_sqstate.h10
-rw-r--r--games/scourge/files/patch-src_squirrel_squtils.h13
2 files changed, 23 insertions, 0 deletions
diff --git a/games/scourge/files/patch-src_squirrel_sqstate.h b/games/scourge/files/patch-src_squirrel_sqstate.h
new file mode 100644
index 000000000000..07aa38c0ae7d
--- /dev/null
+++ b/games/scourge/files/patch-src_squirrel_sqstate.h
@@ -0,0 +1,10 @@
+--- src/squirrel/sqstate.h.orig 2008-12-22 23:38:10.000000000 +0000
++++ src/squirrel/sqstate.h
+@@ -113,7 +113,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 --git a/games/scourge/files/patch-src_squirrel_squtils.h b/games/scourge/files/patch-src_squirrel_squtils.h
new file mode 100644
index 000000000000..d108c4457cba
--- /dev/null
+++ b/games/scourge/files/patch-src_squirrel_squtils.h
@@ -0,0 +1,13 @@
+--- src/squirrel/squtils.h.orig 2008-12-22 23:38:10.000000000 +0000
++++ src/squirrel/squtils.h
+@@ -2,6 +2,10 @@
+ #ifndef _SQUTILS_H_
+ #define _SQUTILS_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);
++
+ #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);