Mercurial > mxe-octave
view src/wxwidgets-1-c++11-related-fixes.patch @ 4387:05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
* tools/makeinst-script.sh.in
(CheckWinVer): use CurrentMajorVersionNumber, CurrentMinorVersionNumber reg values for version number and fall back to Version, if didnt get a version number
| author | John D |
|---|---|
| date | Thu, 18 May 2017 14:29:43 -0400 |
| parents | ae1280afbc8c |
| children |
line wrap: on
line source
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; }