# HG changeset patch # User Christian Brabandt # Date 1506027603 -7200 # Node ID 47da4dcc897eadbe39665d13e393394a477eac4a # Parent d4698612d3346ef4865e31081068d70924b3128f patch 8.0.1132: #if condition is not portable commit https://github.com/vim/vim/commit/fc7649f8b82efbb4c7066567dd69192d97a2749f Author: Bram Moolenaar Date: Thu Sep 21 22:46:47 2017 +0200 patch 8.0.1132: #if condition is not portable Problem: #if condition is not portable. Solution: Add defined(). (Zuloloxi, closes https://github.com/vim/vim/issues/2136) diff --git a/src/libvterm/src/vterm.c b/src/libvterm/src/vterm.c --- 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 --- 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,