35 lines
916 B
Diff
35 lines
916 B
Diff
From aae8432e4cc8557a4e6c2b189e2924d1ae3f7ea7 Mon Sep 17 00:00:00 2001
|
|
From: Scott Talbert <swt@techie.net>
|
|
Date: Sat, 20 Feb 2016 00:08:14 -0500
|
|
Subject: [PATCH] Fix STC compilation with GCC6
|
|
|
|
Closes #17147
|
|
---
|
|
src/stc/scintilla/src/Editor.cxx | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
|
|
index cd72953..2081df2 100644
|
|
--- a/src/stc/scintilla/src/Editor.cxx
|
|
+++ b/src/stc/scintilla/src/Editor.cxx
|
|
@@ -11,6 +11,7 @@
|
|
#include <ctype.h>
|
|
#include <assert.h>
|
|
|
|
+#include <cmath>
|
|
#include <string>
|
|
#include <vector>
|
|
#include <map>
|
|
@@ -5841,9 +5842,9 @@ void Editor::GoToLine(int lineNo) {
|
|
}
|
|
|
|
static bool Close(Point pt1, Point pt2) {
|
|
- if (abs(pt1.x - pt2.x) > 3)
|
|
+ if (std::abs(pt1.x - pt2.x) > 3)
|
|
return false;
|
|
- if (abs(pt1.y - pt2.y) > 3)
|
|
+ if (std::abs(pt1.y - pt2.y) > 3)
|
|
return false;
|
|
return true;
|
|
}
|