patch 8.0.1132: #if condition is not portable

Problem:    #if condition is not portable.
Solution:   Add defined(). (Zuloloxi, closes #2136)

diff --git a/src/libvterm/src/vterm.c b/src/libvterm/src/vterm.c
index b2a7240ffce187e1ed4a20390d852cc8b11627bf..1789fb3563b4c5f055cc1c3126079dfa80768143 100644 (file)
--- 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 1ff5b3ef4b307b1e8887d4657b4d708bb9d33ee6..b90665e51f43b40a2c554206c2f40e52cab3236b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1132,
 /**/
     1131,
 /**/