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/CharClassify.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CharClassify.cxx')

diff --git a/src/CharClassify.cxx b/src/CharClassify.cxx
index f82fe75a6..64d720740 100644
--- a/src/CharClassify.cxx
+++ b/src/CharClassify.cxx
@@ -10,7 +10,7 @@
 
 #include <stdexcept>
 
-#include "CharacterSet.h"
+#include "CharacterType.h"
 #include "CharClassify.h"
 
 using namespace Scintilla;
-- 
cgit v1.2.3