summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2011-05-21 08:40:50 +0000
committersmatz <smatz@openttd.org>2011-05-21 08:40:50 +0000
commit2447efdefd6a52c7be8bbe3c5493dd36b0697804 (patch)
tree78a8532aa4568e54a452e1d8786d78ba25f7dbd2 /src
parent9b54356d3c0db259af47ebec1d841be7724caca8 (diff)
downloadopenttd-2447efdefd6a52c7be8bbe3c5493dd36b0697804.tar.xz
(svn r22481) -Fix: compilation with recent GCC
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/squirrel/squirrel/sqstate.h3
-rw-r--r--src/3rdparty/squirrel/squirrel/squtils.h4
-rw-r--r--src/cmd_helper.h1
3 files changed, 5 insertions, 3 deletions
diff --git a/src/3rdparty/squirrel/squirrel/sqstate.h b/src/3rdparty/squirrel/squirrel/sqstate.h
index 8ddd2254e..d599ee83e 100644
--- a/src/3rdparty/squirrel/squirrel/sqstate.h
+++ b/src/3rdparty/squirrel/squirrel/sqstate.h
@@ -137,7 +137,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/src/3rdparty/squirrel/squirrel/squtils.h b/src/3rdparty/squirrel/squirrel/squtils.h
index 55febe38c..5f7e2e239 100644
--- 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));
diff --git a/src/cmd_helper.h b/src/cmd_helper.h
index 9396dd414..569708dfc 100644
--- a/src/cmd_helper.h
+++ b/src/cmd_helper.h
@@ -13,6 +13,7 @@
#define CMD_HELPER_H
#include "core/enum_type.hpp"
+#include "core/bitmath_func.hpp"
/**
* Extracts a given type from a value.