projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 5a088057 KK |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.668 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.668 | |
| 11 | Problem: Building with Perl loaded dynamically still uses static library. | |
| 12 | Solution: Adjust use of PL_thr_key. (Ken Takata) | |
| 13 | Files: src/if_perl.xs | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.667/src/if_perl.xs 2012-09-21 12:42:38.000000000 +0200 | |
| 17 | --- src/if_perl.xs 2012-09-21 12:47:55.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 155,161 **** | |
| 20 | # define Perl_set_context dll_Perl_set_context | |
| 21 | # if (PERL_REVISION == 5) && (PERL_VERSION >= 14) | |
| 22 | # define Perl_sv_2bool_flags dll_Perl_sv_2bool_flags | |
| 23 | ! # define Perl_xs_apiversion_bootcheck dll_Perl_xs_apiversion_bootcheck | |
| 24 | # else | |
| 25 | # define Perl_sv_2bool dll_Perl_sv_2bool | |
| 26 | # endif | |
| 27 | --- 155,161 ---- | |
| 28 | # define Perl_set_context dll_Perl_set_context | |
| 29 | # if (PERL_REVISION == 5) && (PERL_VERSION >= 14) | |
| 30 | # define Perl_sv_2bool_flags dll_Perl_sv_2bool_flags | |
| 31 | ! # define Perl_xs_apiversion_bootcheck dll_Perl_xs_apiversion_bootcheck | |
| 32 | # else | |
| 33 | # define Perl_sv_2bool dll_Perl_sv_2bool | |
| 34 | # endif | |
| 35 | *************** | |
| 36 | *** 225,230 **** | |
| 37 | --- 225,233 ---- | |
| 38 | # define Perl_call_list dll_Perl_call_list | |
| 39 | # define Perl_Iscopestack_ix_ptr dll_Perl_Iscopestack_ix_ptr | |
| 40 | # define Perl_Iunitcheckav_ptr dll_Perl_Iunitcheckav_ptr | |
| 41 | + # if (PERL_REVISION == 5) && (PERL_VERSION >= 14) | |
| 42 | + # define PL_thr_key *dll_PL_thr_key | |
| 43 | + # endif | |
| 44 | ||
| 45 | /* | |
| 46 | * Declare HANDLE for perl.dll and function pointers. | |
| 47 | *************** | |
| 48 | *** 335,340 **** | |
| 49 | --- 338,344 ---- | |
| 50 | #endif | |
| 51 | ||
| 52 | #if (PERL_REVISION == 5) && (PERL_VERSION >= 14) | |
| 53 | + static perl_key* dll_PL_thr_key; | |
| 54 | #else | |
| 55 | static GV** (*Perl_Idefgv_ptr)(register PerlInterpreter*); | |
| 56 | static GV** (*Perl_Ierrgv_ptr)(register PerlInterpreter*); | |
| 57 | *************** | |
| 58 | *** 453,458 **** | |
| 59 | --- 457,463 ---- | |
| 60 | # endif | |
| 61 | #endif | |
| 62 | #if (PERL_REVISION == 5) && (PERL_VERSION >= 14) | |
| 63 | + {"PL_thr_key", (PERL_PROC*)&dll_PL_thr_key}, | |
| 64 | #else | |
| 65 | {"Perl_Idefgv_ptr", (PERL_PROC*)&Perl_Idefgv_ptr}, | |
| 66 | {"Perl_Ierrgv_ptr", (PERL_PROC*)&Perl_Ierrgv_ptr}, | |
| 67 | *** ../vim-7.3.667/src/version.c 2012-09-21 12:42:38.000000000 +0200 | |
| 68 | --- src/version.c 2012-09-21 12:49:06.000000000 +0200 | |
| 69 | *************** | |
| 70 | *** 721,722 **** | |
| 71 | --- 721,724 ---- | |
| 72 | { /* Add new patch number below this line */ | |
| 73 | + /**/ | |
| 74 | + 668, | |
| 75 | /**/ | |
| 76 | ||
| 77 | -- | |
| 78 | Michael: There is no such thing as a dump question. | |
| 79 | Bernard: Sure there is. For example "what is a core dump?" | |
| 80 | ||
| 81 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 82 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 83 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 84 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |