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.

---
 win32/makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'win32/makefile')

diff --git a/win32/makefile b/win32/makefile
index 7dd2604bb..9a49602ef 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -86,8 +86,8 @@ SRC_OBJS = \
 	CaseConvert.o \
 	CaseFolder.o \
 	CellBuffer.o \
-	CharacterCategory.o \
-	CharacterSet.o \
+	CharacterCategoryMap.o \
+	CharacterType.o \
 	CharClassify.o \
 	ContractionState.o \
 	DBCS.o \
-- 
cgit v1.2.3