Mercurial > vim
diff src/fileio.c @ 15607:2dcaa860e3fc v8.1.0811
patch 8.1.0811: too many #ifdefs
commit https://github.com/vim/vim/commit/30276f2beb248557c6b33cd5418bca8b7084b0a5
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jan 24 17:59:39 2019 +0100
patch 8.1.0811: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Graduate FEAT_MBYTE, the final chapter.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 24 Jan 2019 18:00:07 +0100 |
parents | 1ec942f1b648 |
children | 746b95fd25ad |
line wrap: on
line diff
--- a/src/fileio.c +++ b/src/fileio.c @@ -1178,10 +1178,9 @@ retry: */ if (!skip_read) { -#if VIM_SIZEOF_INT > 2 -# if defined(SSIZE_MAX) && (SSIZE_MAX < 0x10000L) +#if defined(SSIZE_MAX) && (SSIZE_MAX < 0x10000L) size = SSIZE_MAX; /* use max I/O size, 52K */ -# else +#else /* Use buffer >= 64K. Add linerest to double the size if the * line gets very long, to avoid a lot of copying. But don't * read more than 1 Mbyte at a time, so we can be interrupted. @@ -1189,20 +1188,11 @@ retry: size = 0x10000L + linerest; if (size > 0x100000L) size = 0x100000L; -# endif -#else - size = 0x7ff0L - linerest; /* limit buffer to 32K */ #endif } /* Protect against the argument of lalloc() going negative. */ - if ( -#if VIM_SIZEOF_INT <= 2 - linerest >= 0x7ff0 -#else - size < 0 || size + linerest + 1 < 0 || linerest >= MAXCOL -#endif - ) + if (size < 0 || size + linerest + 1 < 0 || linerest >= MAXCOL) { ++split; *ptr = NL; /* split line by inserting a NL */