From 13b6f88d9b4710e1c51b36a97c3b45a6441a7820 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Tue, 27 Apr 2021 10:04:57 +1000
Subject: Rename CharacterSet and CharacterCategory modules in Scintilla to
 CharacterType and CharacterCategoryMap to avoid clashes with Lexilla when
 building an executable that includes both.

---
 scripts/HeaderOrder.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'scripts/HeaderOrder.txt')

diff --git a/scripts/HeaderOrder.txt b/scripts/HeaderOrder.txt
index a45d798de..72ee15cb1 100644
--- a/scripts/HeaderOrder.txt
+++ b/scripts/HeaderOrder.txt
@@ -101,11 +101,9 @@
 #include "Scintilla.h"
 #include "ScintillaWidget.h"
 
-// lexlib
-#include "CharacterSet.h"
-#include "CharacterCategory.h"
-
 // src
+#include "CharacterType.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "UniqueString.h"
 #include "SplitVector.h"
-- 
cgit v1.2.3