From 13b6f88d9b4710e1c51b36a97c3b45a6441a7820 Mon Sep 17 00:00:00 2001 From: Neil 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. --- win32/ScintillaWin.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'win32/ScintillaWin.cxx') diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 4888c286e..dc12d78ee 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -58,7 +58,7 @@ #include "ILexer.h" #include "Scintilla.h" -#include "CharacterCategory.h" +#include "CharacterCategoryMap.h" #include "Position.h" #include "UniqueString.h" #include "SplitVector.h" -- cgit v1.2.3