diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-19 22:46:34 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-19 22:46:34 +0100 |
| commit | 1d6fbe654066845ff2a182ed258e6e9d3408fa90 (patch) | |
| tree | 7300ff3f58090f352c9e56554376588c12c4c104 | |
| parent | 132006c3d0f87dbda5f4d5410fcce312e4716f72 (diff) | |
patch 7.4.1358v7.4.1358
Problem: Compiler warning when not building with +crypt.
Solution: Add #ifdef. (John Marriott)
| -rw-r--r-- | src/undo.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/undo.c b/src/undo.c index 7736f54b59..27e2218267 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 9fb2cdbc8e..9c252746da 100644 --- 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, |