AURUMVORAX/PyG2O
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compile error on gcc:

Browse Source 
renamed 'typeof' function pointer in HSQAPI to 'type_of' to avoid naming collision (gcc implements it's own typeof keyword)

https://gcc.gnu.org/onlinedocs/gcc/Typeof.html
This commit is contained in:
Patrix
2021-04-22 16:13:49 +02:00
parent 14782a9d53
commit 4934b44c0b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dependencies/sqrat/include/sqmodule.h vendored
View File

@@ -205,7 +205,7 @@ extern "C" {
SQRESULT (*setclosureroot)(HSQUIRRELVM v, SQInteger idx); SQRESULT (*setclosureroot)(HSQUIRRELVM v, SQInteger idx);
SQRESULT (*getclosureroot)(HSQUIRRELVM v, SQInteger idx); SQRESULT (*getclosureroot)(HSQUIRRELVM v, SQInteger idx);
void (*pushthread)(HSQUIRRELVM v, HSQUIRRELVM thread); void (*pushthread)(HSQUIRRELVM v, HSQUIRRELVM thread);
SQRESULT (*typeof)(HSQUIRRELVM v, SQInteger idx); SQRESULT (*type_of)(HSQUIRRELVM v, SQInteger idx);
SQHash (*gethash)(HSQUIRRELVM v, SQInteger idx); SQHash (*gethash)(HSQUIRRELVM v, SQInteger idx);
SQRELEASEHOOK (*getreleasehook)(HSQUIRRELVM v, SQInteger idx); SQRELEASEHOOK (*getreleasehook)(HSQUIRRELVM v, SQInteger idx);
SQRESULT (*getfunctioninfo)(HSQUIRRELVM v, SQInteger level, SQFunctionInfo* fi); SQRESULT (*getfunctioninfo)(HSQUIRRELVM v, SQInteger level, SQFunctionInfo* fi);

2
src/api/squirrel_api.h
View File

@@ -58,7 +58,7 @@
#define sq_pushnull SqModule::api->pushnull #define sq_pushnull SqModule::api->pushnull
#define sq_pushthread SqModule::api->pushthread #define sq_pushthread SqModule::api->pushthread
#define sq_gettype SqModule::api->gettype #define sq_gettype SqModule::api->gettype
#define sq_typeof SqModule::api->typeof #define sq_typeof SqModule::api->type_of
#define sq_getsize SqModule::api->getsize #define sq_getsize SqModule::api->getsize
#define sq_gethash SqModule::api->gethash #define sq_gethash SqModule::api->gethash
#define sq_getbase SqModule::api->getbase #define sq_getbase SqModule::api->getbase