vim/patches/vim-7.3.046.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.046
   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.046 (after 7.3.043)
  11 Problem:    Can't build Ruby on MS-Windows.
  12 Solution:   Add #ifdef, don't use WIN3264 before including vim.h.
  13 Files:      src/if_ruby.c
  14
  15
  16 *** ../vim-7.3.045/src/if_ruby.c        2010-10-27 16:49:41.000000000 +0200
  17 --- src/if_ruby.c       2010-10-27 17:37:05.000000000 +0200
  18 ***************
  19 *** 14,20 ****
  20   #include <stdio.h>
  21   #include <string.h>
  22
  23 ! #include "auto/config.h"
  24
  25   #ifdef _WIN32
  26   # if !defined(DYNAMIC_RUBY_VER) || (DYNAMIC_RUBY_VER < 18)
  27 --- 14,22 ----
  28   #include <stdio.h>
  29   #include <string.h>
  30
  31 ! #ifdef HAVE_CONFIG_H
  32 ! # include "auto/config.h"
  33 ! #endif
  34
  35   #ifdef _WIN32
  36   # if !defined(DYNAMIC_RUBY_VER) || (DYNAMIC_RUBY_VER < 18)
  37 ***************
  38 *** 50,56 ****
  39   #  define RUBY_EXPORT
  40   # endif
  41
  42 ! #ifndef WIN3264
  43   # include <dlfcn.h>
  44   # define HINSTANCE void*
  45   # define RUBY_PROC void*
  46 --- 52,58 ----
  47   #  define RUBY_EXPORT
  48   # endif
  49
  50 ! #if !(defined(WIN32) || defined(_WIN64))
  51   # include <dlfcn.h>
  52   # define HINSTANCE void*
  53   # define RUBY_PROC void*
  54 *** ../vim-7.3.045/src/version.c        2010-10-27 17:39:00.000000000 +0200
  55 --- src/version.c       2010-10-27 17:39:59.000000000 +0200
  56 ***************
  57 *** 716,717 ****
  58 --- 716,719 ----
  59   {   /* Add new patch number below this line */
  60 + /**/
  61 +     46,
  62   /**/
  63
  64 --
  65 BLACK KNIGHT:  Come on you pansy!
  66     [hah] [parry thrust]
  67     [ARTHUR chops the BLACK KNIGHT's right arm off]
  68 ARTHUR:        Victory is mine!  [kneeling]
  69                We thank thee Lord, that in thy merc-
  70     [Black Knight kicks Arthur in the head while he is praying]
  71                                   The Quest for the Holy Grail (Monty Python)
  72
  73  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  74 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  75 \\\        download, build and distribute -- http://www.A-A-P.org        ///
  76  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///