diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-03-12 17:08:05 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-03-12 17:08:05 +0100 |
| commit | d8619997c47557a5f8acd52fcab04cd3eb01a0d6 (patch) | |
| tree | 15d122d3b44f3ee2e5d9dc9bc7267baef57ed635 | |
| parent | 206f011829920e41c4d3782af7591da6e1b86655 (diff) | |
| download | vim-git-d8619997c47557a5f8acd52fcab04cd3eb01a0d6.tar.gz | |
updated for version 7.4.198v7.4.198
Problem: Can't build Vim with Perl when -Dusethreads is not specified for
building Perl, and building Vim with --enable-perlinterp=dynamic.
Solution: Adjust #ifdefs. (Yasuhiro Matsumoto)
| -rw-r--r-- | src/if_perl.xs | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs index 57a3b8fd1..590ef86ac 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -138,6 +138,8 @@ typedef int HANDLE; #endif typedef int XSINIT_t; typedef int XSUBADDR_t; +#endif +#ifndef USE_ITHREADS typedef int perl_key; #endif @@ -264,7 +266,9 @@ typedef int perl_key; # define Perl_Iscopestack_ix_ptr dll_Perl_Iscopestack_ix_ptr # define Perl_Iunitcheckav_ptr dll_Perl_Iunitcheckav_ptr # if (PERL_REVISION == 5) && (PERL_VERSION >= 14) -# define PL_thr_key *dll_PL_thr_key +# ifdef USE_ITHREADS +# define PL_thr_key *dll_PL_thr_key +# endif # endif /* @@ -386,7 +390,9 @@ static AV** (*Perl_Iunitcheckav_ptr)(register PerlInterpreter*); #endif #if (PERL_REVISION == 5) && (PERL_VERSION >= 14) +# ifdef USE_ITHREADS static perl_key* dll_PL_thr_key; +# endif #else static GV** (*Perl_Idefgv_ptr)(register PerlInterpreter*); static GV** (*Perl_Ierrgv_ptr)(register PerlInterpreter*); @@ -413,7 +419,9 @@ static struct { #ifdef PERL5101_OR_LATER {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage}, #endif +#ifdef PERL_IMPLICIT_CONTEXT {"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext}, +#endif {"Perl_dowantarray", (PERL_PROC*)&Perl_dowantarray}, {"Perl_free_tmps", (PERL_PROC*)&Perl_free_tmps}, {"Perl_gv_stashpv", (PERL_PROC*)&Perl_gv_stashpv}, @@ -505,7 +513,9 @@ static struct { # endif #endif #if (PERL_REVISION == 5) && (PERL_VERSION >= 14) +# ifdef USE_ITHREADS {"PL_thr_key", (PERL_PROC*)&dll_PL_thr_key}, +# endif #else {"Perl_Idefgv_ptr", (PERL_PROC*)&Perl_Idefgv_ptr}, {"Perl_Ierrgv_ptr", (PERL_PROC*)&Perl_Ierrgv_ptr}, diff --git a/src/version.c b/src/version.c index 7af058b81..3a1070c53 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 198, +/**/ 197, /**/ 196, |