aboutsummaryrefslogtreecommitdiffhomepage
path: root/gtk/makefile
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2021-04-27 10:04:57 +1000
committerNeil <nyamatongwe@gmail.com>2021-04-27 10:04:57 +1000
commit13b6f88d9b4710e1c51b36a97c3b45a6441a7820 (patch)
treea8f7b3fa0e91986f4d0a8125a705df771ddb5f83 /gtk/makefile
parentdd48a3b8b049ab42ac16108b428e947135f82877 (diff)
downloadscintilla-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 'gtk/makefile')
-rw-r--r--gtk/makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/makefile b/gtk/makefile
index a820e1476..8967a16b8 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -128,8 +128,8 @@ SRC_OBJS = \
CaseConvert.o \
CaseFolder.o \
CellBuffer.o \
- CharacterCategory.o \
- CharacterSet.o \
+ CharacterCategoryMap.o \
+ CharacterType.o \
CharClassify.o \
ContractionState.o \
DBCS.o \