diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-21 22:46:47 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-21 22:46:47 +0200 |
| commit | fc7649f8b82efbb4c7066567dd69192d97a2749f (patch) | |
| tree | ff40e63e463d0110f269f356a90b6a1dd94b5fb7 | |
| parent | b00fdf6eed5fec589a86655249a851c2d9ba3bb8 (diff) | |
patch 8.0.1132: #if condition is not portablev8.0.1132
Problem: #if condition is not portable.
Solution: Add defined(). (Zuloloxi, closes #2136)
| -rw-r--r-- | src/libvterm/src/vterm.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/libvterm/src/vterm.c b/src/libvterm/src/vterm.c index b2a7240ffc..1789fb3563 100644 --- a/src/libvterm/src/vterm.c +++ b/src/libvterm/src/vterm.c @@ -130,7 +130,8 @@ static int outbuffer_is_full(VTerm *vt) return vt->outbuffer_cur >= vt->outbuffer_len - 1; } -#if _XOPEN_SOURCE >= 500 || _ISOC99_SOURCE || _BSD_SOURCE +#if (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 500) \ + || defined(_ISOC99_SOURCE) || defined(_BSD_SOURCE) # undef VSNPRINTF # define VSNPRINTF vsnprintf #else diff --git a/src/version.c b/src/version.c index 1ff5b3ef4b..b90665e51f 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1132, +/**/ 1131, /**/ 1130, |