aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 9.0.1639: build failure without the crypt feature

Browse Source 
Problem:    Build failure without the crypt feature.
Solution:   Adjust #ifdefs
This commit is contained in:
Bram Moolenaar
2023-06-17 15:35:03 +01:00
parent 438d0c5e58
commit bc385a150f
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/fileio.c
View File

@@ -218,7 +218,9 @@ readfile(
int using_b_ffname; int using_b_ffname;
int using_b_fname; int using_b_fname;
static char *msg_is_a_directory = N_("is a directory"); static char *msg_is_a_directory = N_("is a directory");
#ifdef FEAT_CRYPT
int eof = FALSE; int eof = FALSE;
#endif
#ifdef FEAT_SODIUM #ifdef FEAT_SODIUM
int may_need_lseek = FALSE; int may_need_lseek = FALSE;
#endif #endif
@@ -1276,10 +1278,11 @@ retry:
if (!curbuf->b_p_eol) if (!curbuf->b_p_eol)
--tlen; --tlen;
size = tlen; size = tlen;
#ifdef FEAT_CRYPT
eof = TRUE; eof = TRUE;
#endif
break; break;
} }
} }
} }
} }
@@ -1331,8 +1334,10 @@ retry:
long read_size = size; long read_size = size;
size = read_eintr(fd, ptr, read_size); size = read_eintr(fd, ptr, read_size);
filesize_count += size; filesize_count += size;
#ifdef FEAT_CRYPT
// hit end of file // hit end of file
eof = (size < read_size || filesize_count == filesize_disk); eof = (size < read_size || filesize_count == filesize_disk);
#endif
} }
#ifdef FEAT_CRYPT #ifdef FEAT_CRYPT

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1639,
/**/ /**/
1638, 1638,
/**/ /**/