From d4808d76f91a7523dd5bc730c634d9fd8210c773 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 13 Nov 2004 02:24:35 +0000 Subject: [PATCH] The assumption that if SIZEOF_INT is defined then SIZEOF_SIZE_T is too is not always true. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index d70efa4cb8..91595ae2c8 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -685,7 +685,8 @@ typedef wxUint16 wxWord; typedef int wxInt32; typedef unsigned int wxUint32; - /* conside that if SIZEOF_INT is defined, all the other ones are too */ + /* Assume that if SIZEOF_INT is defined that all the other ones except + SIZEOF_SIZE_T, are too. See next #if below. */ #ifndef SIZEOF_INT #define SIZEOF_INT 4 #define SIZEOF_LONG 4 @@ -712,6 +713,19 @@ typedef wxUint16 wxWord; #define SIZEOF_VOID_P 4 #endif /* Win64/32 */ #endif /* !defined(SIZEOF_INT) */ + + /* + If Python.h was included first, it defines all of the SIZEOF's above + except for SIZEOF_SIZE_T, so we need to do it here to avoid + triggering the #error in the ssize_t typedefs below... + */ + #ifndef SIZEOF_SIZE_T + #ifdef __WIN64__ + #define SIZEOF_SIZE_T 8 + #else /* Win32 */ + #define SIZEOF_SIZE_T 4 + #endif + #endif #else #error "Unsupported Windows version" #endif -- 2.45.2