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