From d29a22ebc96120ec90605decf3db5557a99dc75a Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Mon, 19 Feb 2018 12:10:04 -0500 Subject: More backport fixes to compile on build server. Requires Scinterm r168 (changeset 46e218082338). --- src/scintilla_backports/6425_73343682cbda.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/scintilla_backports/6425_73343682cbda.patch') diff --git a/src/scintilla_backports/6425_73343682cbda.patch b/src/scintilla_backports/6425_73343682cbda.patch index 36445a10..0126d946 100644 --- a/src/scintilla_backports/6425_73343682cbda.patch +++ b/src/scintilla_backports/6425_73343682cbda.patch @@ -114,7 +114,7 @@ diff -r 5246ca55cf24 -r 73343682cbda src/EditModel.cxx highlightGuideColumn = 0; primarySelection = true; imeInteraction = imeWindowed; -+ bidirectional = Bidirectional::bidiDisabled; ++ bidirectional = bidiDisabled; foldFlags = 0; foldDisplayTextStyle = SC_FOLDDISPLAYTEXT_HIDDEN; hotspot = Range(Sci::invalidPosition); @@ -125,7 +125,7 @@ diff -r 5246ca55cf24 -r 73343682cbda src/EditModel.h enum IMEInteraction { imeWindowed, imeInline } imeInteraction; -+ enum class Bidirectional { bidiDisabled, bidiL2R, bidiR2L } bidirectional; ++ enum Bidirectional { bidiDisabled, bidiL2R, bidiR2L } bidirectional; + int foldFlags; int foldDisplayTextStyle; -- cgit v1.2.3