Mercurial > hg > openttd
changeset 17701:6c98a1c80438 draft
(svn r22481) -Fix: compilation with recent GCC
| author | smatz <smatz@openttd.org> |
|---|---|
| date | Sat, 21 May 2011 08:40:50 +0000 |
| parents | 3d1dd3abf47b |
| children | bcd20b97e0ee |
| files | src/3rdparty/squirrel/squirrel/sqstate.h src/3rdparty/squirrel/squirrel/squtils.h src/cmd_helper.h |
| diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/3rdparty/squirrel/squirrel/sqstate.h +++ b/src/3rdparty/squirrel/squirrel/sqstate.h @@ -137,7 +137,4 @@ 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_
--- a/src/3rdparty/squirrel/squirrel/squtils.h +++ b/src/3rdparty/squirrel/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));