home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.4 / 7.4.168 < prev    next >
Encoding:
Internet Message Format  |  2014-02-04  |  2.5 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.4.168
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 7.4.168
  11. Problem:    Can't compile with Ruby 2.1.0.
  12. Solution:   Add support for new GC. (Kohei Suzuki)
  13. Files:        src/if_ruby.c
  14.  
  15.  
  16. *** ../vim-7.4.167/src/if_ruby.c    2013-05-20 12:47:48.000000000 +0200
  17. --- src/if_ruby.c    2014-02-05 22:35:17.378577243 +0100
  18. ***************
  19. *** 96,101 ****
  20. --- 96,107 ----
  21.   # define rb_num2int rb_num2int_stub
  22.   #endif
  23.   
  24. + # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 21
  25. + /* Ruby 2.1 adds new GC called RGenGC and RARRAY_PTR uses
  26. +  * rb_gc_writebarrier_unprotect_promoted if USE_RGENGC  */
  27. + #  define rb_gc_writebarrier_unprotect_promoted rb_gc_writebarrier_unprotect_promoted_stub
  28. + # endif
  29. + 
  30.   #include <ruby.h>
  31.   #ifdef RUBY19_OR_LATER
  32.   # include <ruby/encoding.h>
  33. ***************
  34. *** 373,378 ****
  35. --- 379,388 ----
  36.   static void* (*ruby_process_options)(int, char**);
  37.   # endif
  38.   
  39. + # if defined(USE_RGENGC) && USE_RGENGC
  40. + static void (*dll_rb_gc_writebarrier_unprotect_promoted)(VALUE);
  41. + # endif
  42. + 
  43.   # if defined(RUBY19_OR_LATER) && !defined(PROTO)
  44.   SIGNED_VALUE rb_num2long_stub(VALUE x)
  45.   {
  46. ***************
  47. *** 406,411 ****
  48. --- 416,428 ----
  49.   #  endif
  50.   # endif
  51.   
  52. + # if defined(USE_RGENGC) && USE_RGENGC
  53. + void rb_gc_writebarrier_unprotect_promoted_stub(VALUE obj)
  54. + {
  55. +     return dll_rb_gc_writebarrier_unprotect_promoted(obj);
  56. + }
  57. + # endif
  58. + 
  59.   static HINSTANCE hinstRuby = NULL; /* Instance of ruby.dll */
  60.   
  61.   /*
  62. ***************
  63. *** 521,526 ****
  64. --- 538,546 ----
  65.   #  endif
  66.       {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
  67.   # endif
  68. + # if defined(USE_RGENGC) && USE_RGENGC
  69. +     {"rb_gc_writebarrier_unprotect_promoted", (RUBY_PROC*)&dll_rb_gc_writebarrier_unprotect_promoted},
  70. + # endif
  71.       {"", NULL},
  72.   };
  73.   
  74. *** ../vim-7.4.167/src/version.c    2014-02-05 22:25:29.982568243 +0100
  75. --- src/version.c    2014-02-05 22:36:14.010578111 +0100
  76. ***************
  77. *** 740,741 ****
  78. --- 740,743 ----
  79.   {   /* Add new patch number below this line */
  80. + /**/
  81. +     168,
  82.   /**/
  83.  
  84. -- 
  85. hundred-and-one symptoms of being an internet addict:
  86. 10E. You start counting in hex.
  87.  
  88.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  89. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  90. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  91.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  92.