diff options
| author | Bram Moolenaar <Bram@vim.org> | 2023-06-17 15:35:03 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-06-17 15:35:03 +0100 |
| commit | bc385a150f9d812bb3e54ff0d5db75d3c6c3bb43 (patch) | |
| tree | f6c82eba3bd256af03b24bd140ee881168be7a94 | |
| parent | 438d0c5e58aa475179ade9a1b99013733c5b8f06 (diff) | |
patch 9.0.1639: build failure without the crypt featurev9.0.1639
Problem: Build failure without the crypt feature.
Solution: Adjust #ifdefs
| -rw-r--r-- | src/fileio.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/fileio.c b/src/fileio.c index 8b65baf62a..ac46a28239 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -218,7 +218,9 @@ readfile( int using_b_ffname; int using_b_fname; static char *msg_is_a_directory = N_("is a directory"); +#ifdef FEAT_CRYPT int eof = FALSE; +#endif #ifdef FEAT_SODIUM int may_need_lseek = FALSE; #endif @@ -1276,10 +1278,11 @@ retry: if (!curbuf->b_p_eol) --tlen; size = tlen; +#ifdef FEAT_CRYPT eof = TRUE; +#endif break; } - } } } @@ -1288,7 +1291,7 @@ retry: /* * Read bytes from the file. */ -# ifdef FEAT_SODIUM +#ifdef FEAT_SODIUM // Let the crypt layer work with a buffer size of 8192 // // Sodium encryption requires a fixed block size to @@ -1327,12 +1330,14 @@ retry: may_need_lseek = FALSE; } } -# endif +#endif long read_size = size; size = read_eintr(fd, ptr, read_size); filesize_count += size; +#ifdef FEAT_CRYPT // hit end of file eof = (size < read_size || filesize_count == filesize_disk); +#endif } #ifdef FEAT_CRYPT diff --git a/src/version.c b/src/version.c index 9488cdac01..364c6b6e31 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1639, +/**/ 1638, /**/ 1637, |