From 97a19c278b5758689ca20bd6d9bcad612f30779c Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 8 Dec 2019 10:27:46 +0100 Subject: [PATCH] parser-inc: define __SIZE_TYPE__ and __PTRDIFF_TYPE__ This fixes an Interrogate parse error in termux when /usr/include gets added as -S argument --- dtool/src/parser-inc/stdtypedefs.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dtool/src/parser-inc/stdtypedefs.h b/dtool/src/parser-inc/stdtypedefs.h index 873ba9425d..bd49086295 100644 --- a/dtool/src/parser-inc/stdtypedefs.h +++ b/dtool/src/parser-inc/stdtypedefs.h @@ -27,16 +27,18 @@ typedef unsigned long ulong; typedef unsigned short ushort; typedef unsigned char uchar; -inline namespace std { #ifdef _WIN64 - typedef unsigned long long size_t; - typedef long long ssize_t; - typedef long long ptrdiff_t; +#define __SIZE_TYPE__ unsigned long long +#define __PTRDIFF_TYPE__ long long #else - typedef unsigned long size_t; - typedef long ssize_t; - typedef long ptrdiff_t; +#define __SIZE_TYPE__ unsigned long +#define __PTRDIFF_TYPE__ long #endif + +inline namespace std { + typedef __SIZE_TYPE__ size_t; + typedef __PTRDIFF_TYPE__ ssize_t; + typedef __PTRDIFF_TYPE__ ptrdiff_t; } struct timeval;