diff options
author | Neil <nyamatongwe@gmail.com> | 2021-04-27 10:04:57 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2021-04-27 10:04:57 +1000 |
commit | 13b6f88d9b4710e1c51b36a97c3b45a6441a7820 (patch) | |
tree | a8f7b3fa0e91986f4d0a8125a705df771ddb5f83 /src/Editor.cxx | |
parent | dd48a3b8b049ab42ac16108b428e947135f82877 (diff) | |
download | scintilla-mirror-13b6f88d9b4710e1c51b36a97c3b45a6441a7820.tar.gz |
Rename CharacterSet and CharacterCategory modules in Scintilla to CharacterType
and CharacterCategoryMap to avoid clashes with Lexilla when building an
executable that includes both.
Diffstat (limited to 'src/Editor.cxx')
-rw-r--r-- | src/Editor.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx index 66b8fe47d..adc9f3492 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -33,8 +33,8 @@ #include "ILexer.h" #include "Scintilla.h" -#include "CharacterSet.h" -#include "CharacterCategory.h" +#include "CharacterType.h" +#include "CharacterCategoryMap.h" #include "Position.h" #include "UniqueString.h" #include "SplitVector.h" |