From 96f5a24f6dfdfff3466ab7c1736dfc741165aaea Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 24 Jan 2016 21:18:54 +0100 Subject: [PATCH] Consider g++ ABI up to 1010 to be compatible with 1002 This is not completely true, but the changes in the versions 9 and 10 of g++ ABI don't (seem to?) affect wxWidgets, so allow using later versions of the compiler for building the code using the libraries created using earlier ones. --- include/wx/build.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/build.h b/include/wx/build.h index 75b4f80e44..241314c23e 100644 --- a/include/wx/build.h +++ b/include/wx/build.h @@ -52,11 +52,11 @@ // GCC and Intel C++ share same C++ ABI (and possibly others in the future), // check if compiler versions are compatible: #if defined(__GXX_ABI_VERSION) - // The changes between ABI versions 1002 through 1008 (documented at + // The changes between ABI versions 1002 through 1010 (documented at // https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html // under -fabi-version) don't affect wxWidgets, so we allow a library // and an application to differ within that range. - #if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <= 1008)) + #if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <= 1010)) #define wxGXX_EFFECTIVE_ABI_VERSION 1002 #else #define wxGXX_EFFECTIVE_ABI_VERSION __GXX_ABI_VERSION