0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 8.0.1098: build failure if libvterm installed

Problem:    Build failure if libvterm installed on the system. (Oleh
            Hushchenkov)
Solution:   Change the CCCTERM argument order. (Ken Takata, closes #2080)
This commit is contained in:
Bram Moolenaar
2017-09-12 22:59:58 +02:00
parent 49a613f84a
commit b984b80cd8
2 changed files with 3 additions and 1 deletions

View File

@@ -3299,7 +3299,7 @@ objects/channel.o: channel.c
Makefile: Makefile:
@echo The name of the makefile MUST be "Makefile" (with capital M)!!!! @echo The name of the makefile MUST be "Makefile" (with capital M)!!!!
CCCTERM = $(CCC) -Ilibvterm/include -DINLINE="" \ CCCTERM = $(CCC_NF) -Ilibvterm/include $(ALL_CFLAGS) -DINLINE="" \
-DVSNPRINTF=vim_vsnprintf \ -DVSNPRINTF=vim_vsnprintf \
-DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \
-DWCWIDTH_FUNCTION=utf_uint2cells -DWCWIDTH_FUNCTION=utf_uint2cells

View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1098,
/**/ /**/
1097, 1097,
/**/ /**/