From 6f2acdebacaed2086f4e1e88ca7c914118895eb5 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Mon, 28 Aug 2017 17:22:28 +1000
Subject: Backport: New header ILoader.h defines ILoader interface as it does
 not belong in ILexer.h.

Backport of changeset 6383:9c8257ff60b7.
---
 include/ILexer.h       | 14 --------------
 include/ILoader.h      | 21 +++++++++++++++++++++
 include/Sci_Position.h |  6 ++++++
 3 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 include/ILoader.h

(limited to 'include')

diff --git a/include/ILexer.h b/include/ILexer.h
index 03e257c8b..fe6e18e3b 100644
--- a/include/ILexer.h
+++ b/include/ILexer.h
@@ -14,12 +14,6 @@
 namespace Scintilla {
 #endif
 
-#ifdef _WIN32
-	#define SCI_METHOD __stdcall
-#else
-	#define SCI_METHOD
-#endif
-
 enum { dvOriginal=0, dvLineEnd=1 };
 
 class IDocument {
@@ -93,14 +87,6 @@ public:
 	virtual const char * SCI_METHOD DescriptionOfStyle(int style) = 0;
 };
 
-class ILoader {
-public:
-	virtual int SCI_METHOD Release() = 0;
-	// Returns a status code from SC_STATUS_*
-	virtual int SCI_METHOD AddData(const char *data, Sci_Position length) = 0;
-	virtual void * SCI_METHOD ConvertToDocument() = 0;
-};
-
 #ifdef SCI_NAMESPACE
 }
 #endif
diff --git a/include/ILoader.h b/include/ILoader.h
new file mode 100644
index 000000000..e989de873
--- /dev/null
+++ b/include/ILoader.h
@@ -0,0 +1,21 @@
+// Scintilla source code edit control
+/** @file ILoader.h
+ ** Interface for loading into a Scintilla document from a background thread.
+ **/
+// Copyright 1998-2017 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef ILOADER_H
+#define ILOADER_H
+
+#include "Sci_Position.h"
+
+class ILoader {
+public:
+	virtual int SCI_METHOD Release() = 0;
+	// Returns a status code from SC_STATUS_*
+	virtual int SCI_METHOD AddData(const char *data, Sci_Position length) = 0;
+	virtual void * SCI_METHOD ConvertToDocument() = 0;
+};
+
+#endif
diff --git a/include/Sci_Position.h b/include/Sci_Position.h
index 1360b2dce..abd0f3408 100644
--- a/include/Sci_Position.h
+++ b/include/Sci_Position.h
@@ -20,4 +20,10 @@ typedef size_t Sci_PositionU;
 // For Sci_CharacterRange  which is defined as long to be compatible with Win32 CHARRANGE
 typedef long Sci_PositionCR;
 
+#ifdef _WIN32
+	#define SCI_METHOD __stdcall
+#else
+	#define SCI_METHOD
+#endif
+
 #endif
-- 
cgit v1.2.3