To: vim_dev@googlegroups.com

Subject: Patch 7.4.128

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.4.128

Problem:    Perl 5.18 for MSVC doesn't work.

Solution:   Add check in makefile and define __inline. (Ken Takata)

Files:	    src/Make_mvc.mak, src/if_perl.xs

*** ../vim-7.4.127/src/Make_mvc.mak	2013-11-09 02:32:15.000000000 +0100

--- src/Make_mvc.mak	2013-12-14 11:47:37.000000000 +0100

***************

*** 825,831 ****

--- 825,836 ----

  PERL_LIB = $(PERL_INCDIR)\perl.lib

  !else

  PERL_DLL = perl$(PERL_VER).dll

+ !if exist($(PERL_INCDIR)\perl$(PERL_VER).lib)

  PERL_LIB = $(PERL_INCDIR)\perl$(PERL_VER).lib

+ !else

+ # For ActivePerl 5.18 and later

+ PERL_LIB = $(PERL_INCDIR)\libperl$(PERL_VER).a

+ !endif

  !endif

  CFLAGS = $(CFLAGS) -DFEAT_PERL

*** ../vim-7.4.127/src/if_perl.xs	2013-12-14 11:46:04.000000000 +0100

--- src/if_perl.xs	2013-12-14 11:47:37.000000000 +0100

***************

*** 44,49 ****

--- 44,54 ----

  # define PERL_NO_INLINE_FUNCTIONS

  #endif

+ /* Work around for using MSVC and ActivePerl 5.18. */

+ #ifdef _MSC_VER

+ # define __inline__ __inline

+ #endif

+ 

  #include <EXTERN.h>

  #include <perl.h>

  #include <XSUB.h>

*** ../vim-7.4.127/src/version.c	2013-12-14 11:46:04.000000000 +0100

--- src/version.c	2013-12-14 11:48:51.000000000 +0100

***************

*** 740,741 ****

--- 740,743 ----

  {   /* Add new patch number below this line */

+ /**/

+     128,

  /**/

-- 

hundred-and-one symptoms of being an internet addict:

55. You ask your doctor to implant a gig in your brain.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\  an exciting new programming language -- http://www.Zimbu.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///