summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBoris Pek <tehnick-8@yandex.ru>2016-05-05 16:11:39 (GMT)
committerBoris Pek <tehnick-8@yandex.ru>2016-05-05 16:11:39 (GMT)
commit6869e3b13b02a29ba13d57036fc78d6315bdcf30 (patch)
tree2b8f39508c1de8580be47b41f000501188897ca5 /src
parent0bcfdad5592864c3aaa3140266ae2bf55b2d21ed (diff)
downloadmxe-6869e3b13b02a29ba13d57036fc78d6315bdcf30.zip
mxe-6869e3b13b02a29ba13d57036fc78d6315bdcf30.tar.gz
mxe-6869e3b13b02a29ba13d57036fc78d6315bdcf30.tar.bz2
wxwidgets: add patch: fix build with GCC >= 6.x
Diffstat (limited to 'src')
-rw-r--r--src/wxwidgets-1-c++11-related-fixes.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/src/wxwidgets-1-c++11-related-fixes.patch b/src/wxwidgets-1-c++11-related-fixes.patch
new file mode 100644
index 0000000..3205001
--- /dev/null
+++ b/src/wxwidgets-1-c++11-related-fixes.patch
@@ -0,0 +1,27 @@
+From: Boris Pek <tehnick-8@mail.ru>
+Date: Thu, 05 May 2016 19:11:19 +0300
+Subject: [PATCH] fix build with GCC >= 6.x
+
+diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
+--- a/src/stc/scintilla/src/Editor.cxx
++++ b/src/stc/scintilla/src/Editor.cxx
+@@ -10,6 +10,7 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <assert.h>
++#include <math.h>
+
+ #include <string>
+ #include <vector>
+@@ -5841,9 +5842,9 @@
+ }
+
+ static bool Close(Point pt1, Point pt2) {
+- if (abs(pt1.x - pt2.x) > 3)
++ if (fabs(pt1.x - pt2.x) > 3)
+ return false;
+- if (abs(pt1.y - pt2.y) > 3)
++ if (fabs(pt1.y - pt2.y) > 3)
+ return false;
+ return true;
+ }