diff options
author | Bram Moolenaar <Bram@vim.org> | 2018-04-14 16:12:30 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2018-04-14 16:12:30 +0200 |
commit | 2a43230ce39eea340aab15fb50a083bc527fb8d0 (patch) | |
tree | 27dbda66e3383b429f89d7481f45f67354510904 | |
parent | 2e324950b83fcdf60843b54a6a339183370f338a (diff) | |
download | vim-git-2a43230ce39eea340aab15fb50a083bc527fb8d0.tar.gz |
patch 8.0.1710: building with Ruby failsv8.0.1710
Problem: Building with Ruby fails.
Solution: Don't add -ansi when building with Ruby.
-rwxr-xr-x | src/auto/configure | 2 | ||||
-rw-r--r-- | src/configure.ac | 7 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/auto/configure b/src/auto/configure index e9ee0171f..29dadf274 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 27309b205..eef443b74 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 b24935f14..b340f1170 100644 --- a/src/version.c +++ b/src/version.c @@ -763,6 +763,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1710, +/**/ 1709, /**/ 1708, |