# HG changeset patch # User Christian Brabandt # Date 1455919205 -3600 # Node ID 985cd591756068655075b8e0e214cd9ba930da51 # Parent e40404256a2311076ce99d23e10efbcbc15c7928 commit https://github.com/vim/vim/commit/1d6fbe654066845ff2a182ed258e6e9d3408fa90 Author: Bram Moolenaar 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) diff --git a/src/undo.c b/src/undo.c --- 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); diff --git a/src/version.c b/src/version.c --- 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,