summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-11-12 16:05:04 +0100
committerBram Moolenaar <Bram@vim.org>2014-11-12 16:05:04 +0100
commit3e9a1614966926a6067c977921d5aa270eba5da7 (patch)
tree3c5750341cb5a712ba41d54aa69c013c2ede9f2d
parentb103138b1e9ff2330901a0bc06378d2e5ed4f9ae (diff)
downloadvim-git-3e9a1614966926a6067c977921d5aa270eba5da7.tar.gz
updated for version 7.4.511v7.4.511
Problem: Generating proto for if_ruby.c uses type not defined elsewhere. Solution: Do not generate a prototype for rb_gc_writebarrier_unprotect_promoted()
-rw-r--r--src/if_ruby.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c
index 06465bd5a..9301b7292 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -418,7 +418,8 @@ VALUE rb_num2ulong(VALUE x)
# endif
# endif
-# if defined(USE_RGENGC) && USE_RGENGC
+ /* Do not generate a prototype here, VALUE isn't always defined. */
+# if defined(USE_RGENGC) && USE_RGENGC && !defined(PROTO)
void rb_gc_writebarrier_unprotect_promoted_stub(VALUE obj)
{
return dll_rb_gc_writebarrier_unprotect_promoted(obj);
diff --git a/src/version.c b/src/version.c
index 89272be50..f2b1ca7c5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 511,
+/**/
510,
/**/
509,