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 /scripts/HeaderOrder.txt | |
| 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 'scripts/HeaderOrder.txt')
| -rw-r--r-- | scripts/HeaderOrder.txt | 6 |
1 files changed, 2 insertions, 4 deletions
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" |