patch 8.0.1710: building with Ruby fails

Problem: Building with Ruby fails. Solution: Don't add -ansi when building with Ruby.
vim · Apr 14, 2018 · 2a43230 · 2a43230
1 parent 2e32495
commit 2a43230
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -762,6 +762,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1710,
 /**/
     1709,
 /**/