From 1d6fbe654066845ff2a182ed258e6e9d3408fa90 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 19 Feb 2016 22:46:34 +0100 Subject: [PATCH] patch 7.4.1358 Problem: Compiler warning when not building with +crypt. Solution: Add #ifdef. (John Marriott) --- src/undo.c | 2 ++ src/version.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/undo.c b/src/undo.c index 7736f54b5..27e221826 100644 --- a/src/undo.c +++ b/src/undo.c @@ -116,7 +116,9 @@ static void u_freeentry(u_entry_T *, long); 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 index 9fb2cdbc8..9c252746d 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1358, /**/ 1357, /**/