changeset 8128:985cd5917560 v7.4.1358

commit https://github.com/vim/vim/commit/1d6fbe654066845ff2a182ed258e6e9d3408fa90 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Feb 19 22:46:34 2016 +0100 patch 7.4.1358 Problem: Compiler warning when not building with +crypt. Solution: Add #ifdef. (John Marriott)
author Christian Brabandt <cb@256bit.org>
date Fri, 19 Feb 2016 23:00:05 +0100
parents e40404256a23
children 6b08fa169bd6
files src/undo.c src/version.c
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/undo.c
+++ b/src/undo.c
@@ -116,7 +116,9 @@ static void u_freeentry(u_entry_T *, lon
 static void corruption_error(char *mesg, char_u *file_name);
 static void u_free_uhp(u_header_T *uhp);
 static int undo_write(bufinfo_T *bi, char_u *ptr, size_t len);
+# ifdef FEAT_CRYPT
 static int undo_flush(bufinfo_T *bi);
+# endif
 static int fwrite_crypt(bufinfo_T *bi, char_u *ptr, size_t len);
 static int undo_write_bytes(bufinfo_T *bi, long_u nr, int len);
 static void put_header_ptr(bufinfo_T *bi, u_header_T *uhp);
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1358,
+/**/
     1357,
 /**/
     1356,