|
 |
dcaee6 |
To: vim_dev@googlegroups.com
|
|
|
dcaee6 |
Subject: Patch 7.4.120
|
|
|
dcaee6 |
Fcc: outbox
|
|
|
dcaee6 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
dcaee6 |
Mime-Version: 1.0
|
|
|
dcaee6 |
Content-Type: text/plain; charset=UTF-8
|
|
|
dcaee6 |
Content-Transfer-Encoding: 8bit
|
|
|
dcaee6 |
------------
|
|
|
dcaee6 |
|
|
|
dcaee6 |
Patch 7.4.120 (after 7.4.117)
|
|
|
dcaee6 |
Problem: Can't build with Perl 5.18 on Linux. (Lcd 47)
|
|
|
dcaee6 |
Solution: Add #ifdef. (Ken Takata)
|
|
|
dcaee6 |
Files: src/if_perl.xs
|
|
|
dcaee6 |
|
|
|
dcaee6 |
|
|
|
dcaee6 |
*** ../vim-7.4.119/src/if_perl.xs 2013-12-11 15:06:36.000000000 +0100
|
|
|
dcaee6 |
--- src/if_perl.xs 2013-12-11 17:17:43.000000000 +0100
|
|
|
dcaee6 |
***************
|
|
|
dcaee6 |
*** 27,33 ****
|
|
|
dcaee6 |
/* Work around for perl-5.18.
|
|
|
dcaee6 |
* Don't include "perl\lib\CORE\inline.h" for now,
|
|
|
dcaee6 |
* include it after Perl_sv_free2 is defined. */
|
|
|
dcaee6 |
! #define PERL_NO_INLINE_FUNCTIONS
|
|
|
dcaee6 |
|
|
|
dcaee6 |
/*
|
|
|
dcaee6 |
* Prevent including winsock.h. perl.h tries to detect whether winsock.h is
|
|
|
dcaee6 |
--- 27,35 ----
|
|
|
dcaee6 |
/* Work around for perl-5.18.
|
|
|
dcaee6 |
* Don't include "perl\lib\CORE\inline.h" for now,
|
|
|
dcaee6 |
* include it after Perl_sv_free2 is defined. */
|
|
|
dcaee6 |
! #ifdef DYNAMIC_PERL
|
|
|
dcaee6 |
! # define PERL_NO_INLINE_FUNCTIONS
|
|
|
dcaee6 |
! #endif
|
|
|
dcaee6 |
|
|
|
dcaee6 |
/*
|
|
|
dcaee6 |
* Prevent including winsock.h. perl.h tries to detect whether winsock.h is
|
|
|
dcaee6 |
*** ../vim-7.4.119/src/version.c 2013-12-11 17:12:32.000000000 +0100
|
|
|
dcaee6 |
--- src/version.c 2013-12-11 17:19:34.000000000 +0100
|
|
|
dcaee6 |
***************
|
|
|
dcaee6 |
*** 740,741 ****
|
|
|
dcaee6 |
--- 740,743 ----
|
|
|
dcaee6 |
{ /* Add new patch number below this line */
|
|
|
dcaee6 |
+ /**/
|
|
|
dcaee6 |
+ 120,
|
|
|
dcaee6 |
/**/
|
|
|
dcaee6 |
|
|
|
dcaee6 |
--
|
|
|
dcaee6 |
Just remember...if the world didn't suck, we'd all fall off.
|
|
|
dcaee6 |
|
|
|
dcaee6 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
dcaee6 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
dcaee6 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
dcaee6 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|