Mercurial > mxe-octave
diff src/wxwidgets-1-c++11-related-fixes.patch @ 4353:ae1280afbc8c
wxwidgets: add fixes for stdc++11 issues in later gcc versions
* src/wxwidgets.mk: disable use of stl, enable unicode
* src/wxwidgets-1-c++11-related-fixes.patch: new file from mxe.cc
* dist-files.mk: add ref to wxwidgets-1-c++11-related-fixes.patch
| author | John D |
|---|---|
| date | Thu, 23 Feb 2017 14:08:10 -0500 |
| parents | |
| children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/wxwidgets-1-c++11-related-fixes.patch Thu Feb 23 14:08:10 2017 -0500 @@ -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; + }