|
 |
dcaee6 |
To: vim_dev@googlegroups.com
|
|
|
dcaee6 |
Subject: Patch 7.4.128
|
|
|
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.128
|
|
|
dcaee6 |
Problem: Perl 5.18 for MSVC doesn't work.
|
|
|
dcaee6 |
Solution: Add check in makefile and define __inline. (Ken Takata)
|
|
|
dcaee6 |
Files: src/Make_mvc.mak, src/if_perl.xs
|
|
|
dcaee6 |
|
|
|
dcaee6 |
|
|
|
dcaee6 |
*** ../vim-7.4.127/src/Make_mvc.mak 2013-11-09 02:32:15.000000000 +0100
|
|
|
dcaee6 |
--- src/Make_mvc.mak 2013-12-14 11:47:37.000000000 +0100
|
|
|
dcaee6 |
***************
|
|
|
dcaee6 |
*** 825,831 ****
|
|
|
dcaee6 |
--- 825,836 ----
|
|
|
dcaee6 |
PERL_LIB = $(PERL_INCDIR)\perl.lib
|
|
|
dcaee6 |
!else
|
|
|
dcaee6 |
PERL_DLL = perl$(PERL_VER).dll
|
|
|
dcaee6 |
+ !if exist($(PERL_INCDIR)\perl$(PERL_VER).lib)
|
|
|
dcaee6 |
PERL_LIB = $(PERL_INCDIR)\perl$(PERL_VER).lib
|
|
|
dcaee6 |
+ !else
|
|
|
dcaee6 |
+ # For ActivePerl 5.18 and later
|
|
|
dcaee6 |
+ PERL_LIB = $(PERL_INCDIR)\libperl$(PERL_VER).a
|
|
|
dcaee6 |
+ !endif
|
|
|
dcaee6 |
!endif
|
|
|
dcaee6 |
|
|
|
dcaee6 |
CFLAGS = $(CFLAGS) -DFEAT_PERL
|
|
|
dcaee6 |
*** ../vim-7.4.127/src/if_perl.xs 2013-12-14 11:46:04.000000000 +0100
|
|
|
dcaee6 |
--- src/if_perl.xs 2013-12-14 11:47:37.000000000 +0100
|
|
|
dcaee6 |
***************
|
|
|
dcaee6 |
*** 44,49 ****
|
|
|
dcaee6 |
--- 44,54 ----
|
|
|
dcaee6 |
# define PERL_NO_INLINE_FUNCTIONS
|
|
|
dcaee6 |
#endif
|
|
|
dcaee6 |
|
|
|
dcaee6 |
+ /* Work around for using MSVC and ActivePerl 5.18. */
|
|
|
dcaee6 |
+ #ifdef _MSC_VER
|
|
|
dcaee6 |
+ # define __inline__ __inline
|
|
|
dcaee6 |
+ #endif
|
|
|
dcaee6 |
+
|
|
|
dcaee6 |
#include <EXTERN.h>
|
|
|
dcaee6 |
#include <perl.h>
|
|
|
dcaee6 |
#include <XSUB.h>
|
|
|
dcaee6 |
*** ../vim-7.4.127/src/version.c 2013-12-14 11:46:04.000000000 +0100
|
|
|
dcaee6 |
--- src/version.c 2013-12-14 11:48:51.000000000 +0100
|
|
|
dcaee6 |
***************
|
|
|
dcaee6 |
*** 740,741 ****
|
|
|
dcaee6 |
--- 740,743 ----
|
|
|
dcaee6 |
{ /* Add new patch number below this line */
|
|
|
dcaee6 |
+ /**/
|
|
|
dcaee6 |
+ 128,
|
|
|
dcaee6 |
/**/
|
|
|
dcaee6 |
|
|
|
dcaee6 |
--
|
|
|
dcaee6 |
hundred-and-one symptoms of being an internet addict:
|
|
|
dcaee6 |
55. You ask your doctor to implant a gig in your brain.
|
|
|
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 ///
|