diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-24 17:59:39 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-24 17:59:39 +0100 |
| commit | 30276f2beb248557c6b33cd5418bca8b7084b0a5 (patch) | |
| tree | 56f7b88712a5ffffdd10681983e70501e2e1ba58 /src/vim.h | |
| parent | 264b74fa545edfb92c0d7d08a02c26331cc5b168 (diff) | |
| download | vim-git-30276f2beb248557c6b33cd5418bca8b7084b0a5.tar.gz | |
patch 8.1.0811: too many #ifdefsv8.1.0811
Problem: Too many #ifdefs.
Solution: Graduate FEAT_MBYTE, the final chapter.
Diffstat (limited to 'src/vim.h')
| -rw-r--r-- | src/vim.h | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -157,6 +157,10 @@ # define VIM_SIZEOF_INT __SIZEOF_INT__ #endif +#if VIM_SIZEOF_INT < 4 && !defined(PROTO) + Error: Vim only works with 32 bit int or larger +#endif + /* * #defines for optionals and features * Also defines FEAT_TINY, FEAT_SMALL, etc. when FEAT_HUGE is defined. @@ -1664,8 +1668,6 @@ typedef long linenr_T; /* line number type */ typedef int colnr_T; /* column number type */ typedef unsigned short disptick_T; /* display tick type */ -#define MAXLNUM (0x7fffffffL) /* maximum (invalid) line number */ - /* * Well, you won't believe it, but some S/390 machines ("host", now also known * as zServer) use 31 bit pointers. There are also some newer machines, that @@ -1675,14 +1677,12 @@ typedef unsigned short disptick_T; /* display tick type */ * With this we restrict the maximum line length to 1073741823. I guess this is * not a real problem. BTW: Longer lines are split. */ -#if VIM_SIZEOF_INT >= 4 -# ifdef __MVS__ -# define MAXCOL (0x3fffffffL) /* maximum column number, 30 bits */ -# else -# define MAXCOL (0x7fffffffL) /* maximum column number, 31 bits */ -# endif +#ifdef __MVS__ +# define MAXCOL (0x3fffffffL) /* maximum column number, 30 bits */ +# define MAXLNUM (0x3fffffffL) /* maximum (invalid) line number */ #else -# define MAXCOL (0x7fff) /* maximum column number, 15 bits */ +# define MAXCOL (0x7fffffffL) /* maximum column number, 31 bits */ +# define MAXLNUM (0x7fffffffL) /* maximum (invalid) line number */ #endif #define SHOWCMD_COLS 10 /* columns needed by shown command */ |