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.3 / 7.3.935 < prev    next >
Encoding:
Internet Message Format  |  2013-05-10  |  3.6 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.935
  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.3.935 (after 7.3.933)
  11. Problem:    Init stack works differently on 64 bit systems.
  12. Solution:   Handle 64 bit systems and also static library. (Yukihiro
  13.         Nakadaira)
  14. Files:        src/if_ruby.c
  15.  
  16.  
  17. *** ../vim-7.3.934/src/if_ruby.c    2013-05-11 13:56:12.000000000 +0200
  18. --- src/if_ruby.c    2013-05-11 17:31:55.000000000 +0200
  19. ***************
  20. *** 227,233 ****
  21.   # define rb_float_new            dll_rb_float_new
  22.   # define rb_ary_new            dll_rb_ary_new
  23.   # define rb_ary_push            dll_rb_ary_push
  24. ! # define ruby_init_stack        dll_ruby_init_stack
  25.   #else
  26.   # define rb_str2cstr            dll_rb_str2cstr
  27.   #endif
  28. --- 227,239 ----
  29.   # define rb_float_new            dll_rb_float_new
  30.   # define rb_ary_new            dll_rb_ary_new
  31.   # define rb_ary_push            dll_rb_ary_push
  32. ! # ifdef __ia64
  33. ! #  define rb_ia64_bsp        dll_rb_ia64_bsp
  34. ! #  undef ruby_init_stack
  35. ! #  define ruby_init_stack(addr)    dll_ruby_init_stack((addr), rb_ia64_bsp())
  36. ! # else
  37. ! #  define ruby_init_stack    dll_ruby_init_stack
  38. ! # endif
  39.   #else
  40.   # define rb_str2cstr            dll_rb_str2cstr
  41.   #endif
  42. ***************
  43. *** 336,342 ****
  44.   static VALUE (*dll_rb_float_new) (double);
  45.   static VALUE (*dll_rb_ary_new) (void);
  46.   static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
  47. ! static void (*ruby_init_stack)(VALUE*);
  48.   #endif
  49.   #ifdef RUBY19_OR_LATER
  50.   static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
  51. --- 342,353 ----
  52.   static VALUE (*dll_rb_float_new) (double);
  53.   static VALUE (*dll_rb_ary_new) (void);
  54.   static VALUE (*dll_rb_ary_push) (VALUE, VALUE);
  55. ! # ifdef __ia64
  56. ! static void * (*dll_rb_ia64_bsp) (void);
  57. ! static void (*dll_ruby_init_stack)(VALUE*, void*);
  58. ! # else
  59. ! static void (*dll_ruby_init_stack)(VALUE*);
  60. ! # endif
  61.   #endif
  62.   #ifdef RUBY19_OR_LATER
  63.   static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
  64. ***************
  65. *** 476,481 ****
  66. --- 487,495 ----
  67.   #endif
  68.   #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
  69.       {"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr},
  70. + # ifdef __ia64
  71. +     {"rb_ia64_bsp", (RUBY_PROC*)&dll_rb_ia64_bsp},
  72. + # endif
  73.       {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
  74.   # if DYNAMIC_RUBY_VER <= 19
  75.       {"rb_float_new", (RUBY_PROC*)&dll_rb_float_new},
  76. ***************
  77. *** 717,723 ****
  78.           NtInitialize(&argc, &argv);
  79.   #endif
  80.           {
  81. ! #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
  82.           ruby_init_stack(ruby_stack_start);
  83.   #endif
  84.           ruby_init();
  85. --- 731,737 ----
  86.           NtInitialize(&argc, &argv);
  87.   #endif
  88.           {
  89. ! #if defined(RUBY_VERSION) && RUBY_VERSION >= 18
  90.           ruby_init_stack(ruby_stack_start);
  91.   #endif
  92.           ruby_init();
  93. *** ../vim-7.3.934/src/version.c    2013-05-11 15:50:02.000000000 +0200
  94. --- src/version.c    2013-05-11 17:39:08.000000000 +0200
  95. ***************
  96. *** 730,731 ****
  97. --- 730,733 ----
  98.   {   /* Add new patch number below this line */
  99. + /**/
  100. +     935,
  101.   /**/
  102.  
  103. -- 
  104. ARTHUR:    Well, it doesn't matter.  Will you go and tell your master that
  105.            Arthur from the Court of Camelot is here.
  106. GUARD #1:  Listen, in order to maintain air-speed velocity, a swallow
  107.            needs to beat its wings 43 times every second, right?
  108. ARTHUR:    Please!
  109.                                   The Quest for the Holy Grail (Monty Python)
  110.  
  111.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  112. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  113. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  114.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  115.