|
 |
1e3c2fa |
To: vim_dev@googlegroups.com
|
|
|
1e3c2fa |
Subject: Patch 7.3.046
|
|
|
1e3c2fa |
Fcc: outbox
|
|
|
1e3c2fa |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
1e3c2fa |
Mime-Version: 1.0
|
|
|
1e3c2fa |
Content-Type: text/plain; charset=UTF-8
|
|
|
1e3c2fa |
Content-Transfer-Encoding: 8bit
|
|
|
1e3c2fa |
------------
|
|
|
1e3c2fa |
|
|
|
1e3c2fa |
Patch 7.3.046 (after 7.3.043)
|
|
|
1e3c2fa |
Problem: Can't build Ruby on MS-Windows.
|
|
|
1e3c2fa |
Solution: Add #ifdef, don't use WIN3264 before including vim.h.
|
|
|
1e3c2fa |
Files: src/if_ruby.c
|
|
|
1e3c2fa |
|
|
|
1e3c2fa |
|
|
|
1e3c2fa |
*** ../vim-7.3.045/src/if_ruby.c 2010-10-27 16:49:41.000000000 +0200
|
|
|
1e3c2fa |
--- src/if_ruby.c 2010-10-27 17:37:05.000000000 +0200
|
|
|
1e3c2fa |
***************
|
|
|
1e3c2fa |
*** 14,20 ****
|
|
|
1e3c2fa |
#include <stdio.h>
|
|
|
1e3c2fa |
#include <string.h>
|
|
|
1e3c2fa |
|
|
|
1e3c2fa |
! #include "auto/config.h"
|
|
|
1e3c2fa |
|
|
|
1e3c2fa |
#ifdef _WIN32
|
|
|
1e3c2fa |
# if !defined(DYNAMIC_RUBY_VER) || (DYNAMIC_RUBY_VER < 18)
|
|
|
1e3c2fa |
--- 14,22 ----
|
|
|
1e3c2fa |
#include <stdio.h>
|
|
|
1e3c2fa |
#include <string.h>
|
|
|
1e3c2fa |
|
|
|
1e3c2fa |
! #ifdef HAVE_CONFIG_H
|
|
|
1e3c2fa |
! # include "auto/config.h"
|
|
|
1e3c2fa |
! #endif
|
|
|
1e3c2fa |
|
|
|
1e3c2fa |
#ifdef _WIN32
|
|
|
1e3c2fa |
# if !defined(DYNAMIC_RUBY_VER) || (DYNAMIC_RUBY_VER < 18)
|
|
|
1e3c2fa |
***************
|
|
|
1e3c2fa |
*** 50,56 ****
|
|
|
1e3c2fa |
# define RUBY_EXPORT
|
|
|
1e3c2fa |
# endif
|
|
|
1e3c2fa |
|
|
|
1e3c2fa |
! #ifndef WIN3264
|
|
|
1e3c2fa |
# include <dlfcn.h>
|
|
|
1e3c2fa |
# define HINSTANCE void*
|
|
|
1e3c2fa |
# define RUBY_PROC void*
|
|
|
1e3c2fa |
--- 52,58 ----
|
|
|
1e3c2fa |
# define RUBY_EXPORT
|
|
|
1e3c2fa |
# endif
|
|
|
1e3c2fa |
|
|
|
1e3c2fa |
! #if !(defined(WIN32) || defined(_WIN64))
|
|
|
1e3c2fa |
# include <dlfcn.h>
|
|
|
1e3c2fa |
# define HINSTANCE void*
|
|
|
1e3c2fa |
# define RUBY_PROC void*
|
|
|
1e3c2fa |
*** ../vim-7.3.045/src/version.c 2010-10-27 17:39:00.000000000 +0200
|
|
|
1e3c2fa |
--- src/version.c 2010-10-27 17:39:59.000000000 +0200
|
|
|
1e3c2fa |
***************
|
|
|
1e3c2fa |
*** 716,717 ****
|
|
|
1e3c2fa |
--- 716,719 ----
|
|
|
1e3c2fa |
{ /* Add new patch number below this line */
|
|
|
1e3c2fa |
+ /**/
|
|
|
1e3c2fa |
+ 46,
|
|
|
1e3c2fa |
/**/
|
|
|
1e3c2fa |
|
|
|
1e3c2fa |
--
|
|
|
1e3c2fa |
BLACK KNIGHT: Come on you pansy!
|
|
|
1e3c2fa |
[hah] [parry thrust]
|
|
|
1e3c2fa |
[ARTHUR chops the BLACK KNIGHT's right arm off]
|
|
|
1e3c2fa |
ARTHUR: Victory is mine! [kneeling]
|
|
|
1e3c2fa |
We thank thee Lord, that in thy merc-
|
|
|
1e3c2fa |
[Black Knight kicks Arthur in the head while he is praying]
|
|
|
1e3c2fa |
The Quest for the Holy Grail (Monty Python)
|
|
|
1e3c2fa |
|
|
|
1e3c2fa |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
1e3c2fa |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
1e3c2fa |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
1e3c2fa |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|