|
 |
073263 |
To: vim_dev@googlegroups.com
|
|
|
073263 |
Subject: Patch 7.4.198
|
|
|
073263 |
Fcc: outbox
|
|
|
073263 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
073263 |
Mime-Version: 1.0
|
|
|
073263 |
Content-Type: text/plain; charset=UTF-8
|
|
|
073263 |
Content-Transfer-Encoding: 8bit
|
|
|
073263 |
------------
|
|
|
073263 |
|
|
|
073263 |
Patch 7.4.198
|
|
|
073263 |
Problem: Can't build Vim with Perl when -Dusethreads is not specified for
|
|
|
073263 |
building Perl, and building Vim with --enable-perlinterp=dynamic.
|
|
|
073263 |
Solution: Adjust #ifdefs. (Yasuhiro Matsumoto)
|
|
|
073263 |
Files: src/if_perl.xs
|
|
|
073263 |
|
|
|
073263 |
|
|
|
073263 |
*** ../vim-7.4.197/src/if_perl.xs 2013-12-14 11:50:28.000000000 +0100
|
|
|
073263 |
--- src/if_perl.xs 2014-03-12 17:05:07.832804995 +0100
|
|
|
073263 |
***************
|
|
|
073263 |
*** 138,143 ****
|
|
|
073263 |
--- 138,145 ----
|
|
|
073263 |
#endif
|
|
|
073263 |
typedef int XSINIT_t;
|
|
|
073263 |
typedef int XSUBADDR_t;
|
|
|
073263 |
+ #endif
|
|
|
073263 |
+ #ifndef USE_ITHREADS
|
|
|
073263 |
typedef int perl_key;
|
|
|
073263 |
#endif
|
|
|
073263 |
|
|
|
073263 |
***************
|
|
|
073263 |
*** 264,270 ****
|
|
|
073263 |
# define Perl_Iscopestack_ix_ptr dll_Perl_Iscopestack_ix_ptr
|
|
|
073263 |
# define Perl_Iunitcheckav_ptr dll_Perl_Iunitcheckav_ptr
|
|
|
073263 |
# if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
|
|
|
073263 |
! # define PL_thr_key *dll_PL_thr_key
|
|
|
073263 |
# endif
|
|
|
073263 |
|
|
|
073263 |
/*
|
|
|
073263 |
--- 266,274 ----
|
|
|
073263 |
# define Perl_Iscopestack_ix_ptr dll_Perl_Iscopestack_ix_ptr
|
|
|
073263 |
# define Perl_Iunitcheckav_ptr dll_Perl_Iunitcheckav_ptr
|
|
|
073263 |
# if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
|
|
|
073263 |
! # ifdef USE_ITHREADS
|
|
|
073263 |
! # define PL_thr_key *dll_PL_thr_key
|
|
|
073263 |
! # endif
|
|
|
073263 |
# endif
|
|
|
073263 |
|
|
|
073263 |
/*
|
|
|
073263 |
***************
|
|
|
073263 |
*** 386,392 ****
|
|
|
073263 |
--- 390,398 ----
|
|
|
073263 |
#endif
|
|
|
073263 |
|
|
|
073263 |
#if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
|
|
|
073263 |
+ # ifdef USE_ITHREADS
|
|
|
073263 |
static perl_key* dll_PL_thr_key;
|
|
|
073263 |
+ # endif
|
|
|
073263 |
#else
|
|
|
073263 |
static GV** (*Perl_Idefgv_ptr)(register PerlInterpreter*);
|
|
|
073263 |
static GV** (*Perl_Ierrgv_ptr)(register PerlInterpreter*);
|
|
|
073263 |
***************
|
|
|
073263 |
*** 413,419 ****
|
|
|
073263 |
--- 419,427 ----
|
|
|
073263 |
#ifdef PERL5101_OR_LATER
|
|
|
073263 |
{"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage},
|
|
|
073263 |
#endif
|
|
|
073263 |
+ #ifdef PERL_IMPLICIT_CONTEXT
|
|
|
073263 |
{"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext},
|
|
|
073263 |
+ #endif
|
|
|
073263 |
{"Perl_dowantarray", (PERL_PROC*)&Perl_dowantarray},
|
|
|
073263 |
{"Perl_free_tmps", (PERL_PROC*)&Perl_free_tmps},
|
|
|
073263 |
{"Perl_gv_stashpv", (PERL_PROC*)&Perl_gv_stashpv},
|
|
|
073263 |
***************
|
|
|
073263 |
*** 505,511 ****
|
|
|
073263 |
--- 513,521 ----
|
|
|
073263 |
# endif
|
|
|
073263 |
#endif
|
|
|
073263 |
#if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
|
|
|
073263 |
+ # ifdef USE_ITHREADS
|
|
|
073263 |
{"PL_thr_key", (PERL_PROC*)&dll_PL_thr_key},
|
|
|
073263 |
+ # endif
|
|
|
073263 |
#else
|
|
|
073263 |
{"Perl_Idefgv_ptr", (PERL_PROC*)&Perl_Idefgv_ptr},
|
|
|
073263 |
{"Perl_Ierrgv_ptr", (PERL_PROC*)&Perl_Ierrgv_ptr},
|
|
|
073263 |
*** ../vim-7.4.197/src/version.c 2014-03-12 16:51:35.060792541 +0100
|
|
|
073263 |
--- src/version.c 2014-03-12 17:06:27.660806218 +0100
|
|
|
073263 |
***************
|
|
|
073263 |
*** 740,741 ****
|
|
|
073263 |
--- 740,743 ----
|
|
|
073263 |
{ /* Add new patch number below this line */
|
|
|
073263 |
+ /**/
|
|
|
073263 |
+ 198,
|
|
|
073263 |
/**/
|
|
|
073263 |
|
|
|
073263 |
--
|
|
|
073263 |
Dogs must have a permit signed by the mayor in order to congregate in groups
|
|
|
073263 |
of three or more on private property.
|
|
|
073263 |
[real standing law in Oklahoma, United States of America]
|
|
|
073263 |
|
|
|
073263 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
073263 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
073263 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
073263 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|