blob: 969371f7fdc6bddf1cf4bb85064c1f9e20a7ae15 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
|
diff -Naur wxPython-src-2.8.12.1/include/wx/build.h wxPython-src-2.8.12.1_patched/include/wx/build.h
--- wxPython-src-2.8.12.1/include/wx/build.h 2007-07-04 22:24:57.000000000 +0300
+++ wxPython-src-2.8.12.1_patched/include/wx/build.h 2017-07-03 22:44:18.796819506 +0300
@@ -57,8 +57,13 @@
// 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)
+ #if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <=1011))
+ #define wxGXX_EFFECTIVE_ABI_VERSION 1002
+ #else
+ #define wxGXX_EFFECTIVE_ABI_VERSION __GXX_ABI_VERSION
+ #endif
#define __WX_BO_COMPILER \
- ",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION)
+ ",compiler with C++ ABI " __WX_BO_STRINGIZE(wxGXX_EFFECTIVE_ABI_VERSION)
#elif defined(__INTEL_COMPILER)
#define __WX_BO_COMPILER ",Intel C++"
#elif defined(__GNUG__)
|
