Skip to content

Commit bc385a1

Browse files
committed
patch 9.0.1639: build failure without the crypt feature
Problem: Build failure without the crypt feature. Solution: Adjust #ifdefs
1 parent 438d0c5 commit bc385a1

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/fileio.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,9 @@ readfile(
218218
int using_b_ffname;
219219
int using_b_fname;
220220
static char *msg_is_a_directory = N_("is a directory");
221+
#ifdef FEAT_CRYPT
221222
int eof = FALSE;
223+
#endif
222224
#ifdef FEAT_SODIUM
223225
int may_need_lseek = FALSE;
224226
#endif
@@ -1276,10 +1278,11 @@ readfile(
12761278
if (!curbuf->b_p_eol)
12771279
--tlen;
12781280
size = tlen;
1281+
#ifdef FEAT_CRYPT
12791282
eof = TRUE;
1283+
#endif
12801284
break;
12811285
}
1282-
12831286
}
12841287
}
12851288
}
@@ -1288,7 +1291,7 @@ readfile(
12881291
/*
12891292
* Read bytes from the file.
12901293
*/
1291-
# ifdef FEAT_SODIUM
1294+
#ifdef FEAT_SODIUM
12921295
// Let the crypt layer work with a buffer size of 8192
12931296
//
12941297
// Sodium encryption requires a fixed block size to
@@ -1327,12 +1330,14 @@ readfile(
13271330
may_need_lseek = FALSE;
13281331
}
13291332
}
1330-
# endif
1333+
#endif
13311334
long read_size = size;
13321335
size = read_eintr(fd, ptr, read_size);
13331336
filesize_count += size;
1337+
#ifdef FEAT_CRYPT
13341338
// hit end of file
13351339
eof = (size < read_size || filesize_count == filesize_disk);
1340+
#endif
13361341
}
13371342

13381343
#ifdef FEAT_CRYPT

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1639,
698700
/**/
699701
1638,
700702
/**/

0 commit comments

Comments
 (0)