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
index 7736f54b59337c4a18c34c182d41a57471f1a4c8..27e2218267a7a7f7070d18d7f6361940e48426ab 100644 (file)
--- 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 9fb2cdbc8e775e78f272f7fbbc0cf5b3f1f80383..9c252746da588fcdd9bfdf0c6935caf855c729ee 100644 (file)
--- 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,
 /**/