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.

---
 src/Document.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Document.cxx')

diff --git a/src/Document.cxx b/src/Document.cxx
index 0a4c8ca0b..ffbf8f557 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -32,8 +32,8 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 
-#include "CharacterSet.h"
-#include "CharacterCategory.h"
+#include "CharacterType.h"
+#include "CharacterCategoryMap.h"
 #include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
-- 
cgit v1.2.3