summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-07-28 14:19:19 +0200
committerBram Moolenaar <Bram@vim.org>2017-07-28 14:19:19 +0200
commitfa228f716a4b63bf508887a49ce56bf4c07364d3 (patch)
tree50b568e66d5a33ad2cb4fa460d2932d4aef28fc3
parent96ad8c9ac181b51605ac1f399c7835a515e5a1fa (diff)
downloadvim-git-8.0.0790.tar.gz
patch 8.0.0790: MSVC compiler warning for strncpy in libvtermv8.0.0790
Problem: MSVC compiler warning for strncpy in libvterm. Solution: Add a define to stop the warnings. (Mike Williams)
-rw-r--r--src/Make_mvc.mak4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index f86bb209b..5311ed3e8 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1341,7 +1341,7 @@ $(OUTDIR)/if_lua.obj: $(OUTDIR) if_lua.c $(INCL)
if_perl.c : if_perl.xs typemap
$(XSUBPP) -prototypes -typemap $(XSUBPP_TYPEMAP) \
- -typemap typemap if_perl.xs > if_perl.c
+ -typemap typemap if_perl.xs -output if_perl.c
$(OUTDIR)/if_perl.obj: $(OUTDIR) if_perl.c $(INCL)
$(CC) $(CFLAGS_OUTDIR) $(PERL_INC) if_perl.c
@@ -1470,7 +1470,7 @@ $(OUTDIR)/dimm_i.obj: $(OUTDIR) dimm_i.c $(INCL)
$(OUTDIR)/glbl_ime.obj: $(OUTDIR) glbl_ime.cpp dimm.h $(INCL)
-CCCTERM = $(CC) $(CFLAGS) -Ilibvterm/include -DINLINE="" -DVSNPRINTF=vim_vsnprintf
+CCCTERM = $(CC) $(CFLAGS) -Ilibvterm/include -DINLINE="" -DVSNPRINTF=vim_vsnprintf -D_CRT_SECURE_NO_WARNINGS
$(OUTDIR)/term_encoding.obj: $(OUTDIR) libvterm/src/encoding.c $(TERM_DEPS)
$(CCCTERM) -Fo$@ libvterm/src/encoding.c
diff --git a/src/version.c b/src/version.c
index 83e873502..e44778c7c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 790,
+/**/
789,
/**/
788,