0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

patch 7.4.987

Problem:    Can't build with Ruby 1.9.2.
Solution:   Require Rub 2.0 for defining USE_TYPEDDATA.
This commit is contained in:
Bram Moolenaar
2015-12-28 22:05:28 +01:00
parent da9888a3f0
commit 0d27f64f71
2 changed files with 11 additions and 3 deletions

View File

@@ -81,6 +81,11 @@
# define RUBY19_OR_LATER 1 # define RUBY19_OR_LATER 1
#endif #endif
#if (defined(RUBY_VERSION) && RUBY_VERSION >= 20) \
|| (defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20)
# define RUBY20_OR_LATER 1
#endif
#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19 #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
/* Ruby 1.9 defines a number of static functions which use rb_num2long and /* Ruby 1.9 defines a number of static functions which use rb_num2long and
* rb_int2big */ * rb_int2big */
@@ -122,11 +127,12 @@
#endif #endif
/* /*
* The TypedData_XXX macro family can be used since Ruby 1.9.2, and * The TypedData_XXX macro family can be used since Ruby 1.9.2 but
* the old Data_XXX macro family was deprecated on Ruby 2.2. * rb_data_type_t changed in 1.9.3, therefore require at least 2.0.
* The old Data_XXX macro family was deprecated on Ruby 2.2.
* Use TypedData_XXX if available. * Use TypedData_XXX if available.
*/ */
#ifdef TypedData_Wrap_Struct #if defined(TypedData_Wrap_Struct) && defined(RUBY20_OR_LATER)
# define USE_TYPEDDATA 1 # define USE_TYPEDDATA 1
#endif #endif

View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
987,
/**/ /**/
986, 986,
/**/ /**/