diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-09-21 12:50:51 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-09-21 12:50:51 +0200 |
| commit | 01c10524d25e36e72c7e45048a80cdb410165560 (patch) | |
| tree | f6d56970c10d87460df01fd25bd2c6c1b077458b | |
| parent | f5fe79a5f38e0fef6077aa858b60989e94076910 (diff) | |
| download | vim-git-7.3.668.tar.gz | |
updated for version 7.3.668v7.3.668
Problem: Building with Perl loaded dynamically still uses static library.
Solution: Adjust use of PL_thr_key. (Ken Takata)
| -rw-r--r-- | src/if_perl.xs | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs index 56e0eb3a1..f0baabff6 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -155,7 +155,7 @@ typedef int perl_key; # define Perl_set_context dll_Perl_set_context # if (PERL_REVISION == 5) && (PERL_VERSION >= 14) # define Perl_sv_2bool_flags dll_Perl_sv_2bool_flags -# define Perl_xs_apiversion_bootcheck dll_Perl_xs_apiversion_bootcheck +# define Perl_xs_apiversion_bootcheck dll_Perl_xs_apiversion_bootcheck # else # define Perl_sv_2bool dll_Perl_sv_2bool # endif @@ -225,6 +225,9 @@ typedef int perl_key; # define Perl_call_list dll_Perl_call_list # 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 +# endif /* * Declare HANDLE for perl.dll and function pointers. @@ -335,6 +338,7 @@ static AV** (*Perl_Iunitcheckav_ptr)(register PerlInterpreter*); #endif #if (PERL_REVISION == 5) && (PERL_VERSION >= 14) +static perl_key* dll_PL_thr_key; #else static GV** (*Perl_Idefgv_ptr)(register PerlInterpreter*); static GV** (*Perl_Ierrgv_ptr)(register PerlInterpreter*); @@ -453,6 +457,7 @@ static struct { # endif #endif #if (PERL_REVISION == 5) && (PERL_VERSION >= 14) + {"PL_thr_key", (PERL_PROC*)&dll_PL_thr_key}, #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 4c93e3a39..61e9c0bb1 100644 --- a/src/version.c +++ b/src/version.c @@ -720,6 +720,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 668, +/**/ 667, /**/ 666, |