From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 14 Apr 2018 14:12:30 +0000 (+0200)
Subject: patch 8.0.1710: building with Ruby fails
X-Git-Tag: v8.0.1710
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a43230ce39eea340aab15fb50a083bc527fb8d0;p=thirdparty%2Fvim.git

patch 8.0.1710: building with Ruby fails

Problem:    Building with Ruby fails.
Solution:   Don't add -ansi when building with Ruby.
---

diff --git a/src/auto/configure b/src/auto/configure
index e9ee0171f7..29dadf2747 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -14434,7 +14434,7 @@ if test "$zOSUnix" = "yes"; then
 	CFLAGS="-D_ALL_SOURCE -Wc,float\(ieee\),dll"
 fi
 
-if test "$GCC" = yes -a "$GUITYPE" != "GTK"; then
+if test "$GCC" = yes -a "$GUITYPE" != "GTK" -a "X$RUBY_CFLAGS" = "X"; then
   CFLAGS="$CFLAGS -ansi"
 fi
 
diff --git a/src/configure.ac b/src/configure.ac
index 27309b205d..eef443b741 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4403,9 +4403,10 @@ if test "$zOSUnix" = "yes"; then
 	CFLAGS="-D_ALL_SOURCE -Wc,float\(ieee\),dll"
 fi
 
-dnl Declare what standards the code should comply with.  But not when using
-dnl GTK, the header files cause all kinds of warnings.
-if test "$GCC" = yes -a "$GUITYPE" != "GTK"; then
+dnl Declare what standards the code should comply with.
+dnl But not when using GTK, the header files cause all kinds of warnings.
+dnl But not when using Ruby, it needs "inline".
+if test "$GCC" = yes -a "$GUITYPE" != "GTK" -a "X$RUBY_CFLAGS" = "X"; then
   CFLAGS="$CFLAGS -ansi"
 fi
 
diff --git a/src/version.c b/src/version.c
index b24935f14d..b340f11701 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 */
+/**/
+    1710,
 /**/
     1709,
 /**/