Mercurial > vim

changeset 12507:47da4dcc897e v8.0.1132

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1132: #if condition is not portable commit https://github.com/vim/vim/commit/fc7649f8b82efbb4c7066567dd69192d97a2749f Author: Bram Moolenaar <Bram@vim.org> 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)
author Christian Brabandt <cb@256bit.org>
date Thu, 21 Sep 2017 23:00:03 +0200
parents d4698612d334
children b2ea213e5e30
files src/libvterm/src/vterm.c src/version.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,