|
 |
dcaee6 |
To: vim_dev@googlegroups.com
|
|
|
dcaee6 |
Subject: Patch 7.4.127
|
|
|
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.127
|
|
|
dcaee6 |
Problem: Perl 5.18 on Unix doesn't work.
|
|
|
dcaee6 |
Solution: Move workaround to after including vim.h. (Ken Takata)
|
|
|
dcaee6 |
Files: src/if_perl.xs
|
|
|
dcaee6 |
|
|
|
dcaee6 |
|
|
|
dcaee6 |
*** ../vim-7.4.126/src/if_perl.xs 2013-12-11 17:20:14.000000000 +0100
|
|
|
dcaee6 |
--- src/if_perl.xs 2013-12-14 11:41:56.000000000 +0100
|
|
|
dcaee6 |
***************
|
|
|
dcaee6 |
*** 24,36 ****
|
|
|
dcaee6 |
# define _USE_32BIT_TIME_T
|
|
|
dcaee6 |
#endif
|
|
|
dcaee6 |
|
|
|
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 |
* already included before including winsock2.h, because winsock2.h isn't
|
|
|
dcaee6 |
--- 24,29 ----
|
|
|
dcaee6 |
***************
|
|
|
dcaee6 |
*** 44,49 ****
|
|
|
dcaee6 |
--- 37,49 ----
|
|
|
dcaee6 |
|
|
|
dcaee6 |
#include "vim.h"
|
|
|
dcaee6 |
|
|
|
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 |
#include <EXTERN.h>
|
|
|
dcaee6 |
#include <perl.h>
|
|
|
dcaee6 |
#include <XSUB.h>
|
|
|
dcaee6 |
*** ../vim-7.4.126/src/version.c 2013-12-12 20:25:39.000000000 +0100
|
|
|
dcaee6 |
--- src/version.c 2013-12-14 11:43:54.000000000 +0100
|
|
|
dcaee6 |
***************
|
|
|
dcaee6 |
*** 740,741 ****
|
|
|
dcaee6 |
--- 740,743 ----
|
|
|
dcaee6 |
{ /* Add new patch number below this line */
|
|
|
dcaee6 |
+ /**/
|
|
|
dcaee6 |
+ 127,
|
|
|
dcaee6 |
/**/
|
|
|
dcaee6 |
|
|
|
dcaee6 |
--
|
|
|
dcaee6 |
hundred-and-one symptoms of being an internet addict:
|
|
|
dcaee6 |
54. You start tilting your head sideways to smile. :-)
|
|
|
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 ///
|