]>
Commit | Line | Data |
---|---|---|
59ab3540 AM |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.297 | |
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.297 | |
11 | Problem: Can't load Perl 5.14 dynamically. | |
12 | Solution: Add code in #ifdefs. (Charles Cooper) | |
13 | Files: if_perl.xs | |
14 | ||
15 | ||
16 | *** ../vim-7.3.296/src/if_perl.xs 2011-07-27 14:15:41.000000000 +0200 | |
17 | --- src/if_perl.xs 2011-09-07 18:47:07.000000000 +0200 | |
18 | *************** | |
19 | *** 147,153 **** | |
20 | --- 147,158 ---- | |
21 | # define Perl_save_int dll_Perl_save_int | |
22 | # define Perl_stack_grow dll_Perl_stack_grow | |
23 | # define Perl_set_context dll_Perl_set_context | |
24 | + # if (PERL_REVISION == 5) && (PERL_VERSION >= 14) | |
25 | + # define Perl_sv_2bool_flags dll_Perl_sv_2bool_flags | |
26 | + # define Perl_xs_apiversion_bootcheck dll_Perl_xs_apiversion_bootcheck | |
27 | + # else | |
28 | # define Perl_sv_2bool dll_Perl_sv_2bool | |
29 | + # endif | |
30 | # define Perl_sv_2iv dll_Perl_sv_2iv | |
31 | # define Perl_sv_2mortal dll_Perl_sv_2mortal | |
32 | # if (PERL_REVISION == 5) && (PERL_VERSION >= 8) | |
33 | *************** | |
34 | *** 252,258 **** | |
35 | --- 257,268 ---- | |
36 | static void (*Perl_save_int)(pTHX_ int*); | |
37 | static SV** (*Perl_stack_grow)(pTHX_ SV**, SV**p, int); | |
38 | static SV** (*Perl_set_context)(void*); | |
39 | + #if (PERL_REVISION == 5) && (PERL_VERSION >= 14) | |
40 | + static bool (*Perl_sv_2bool_flags)(pTHX_ SV*, I32); | |
41 | + static void (*Perl_xs_apiversion_bootcheck)(pTHX_ SV *module, const char *api_p, STRLEN api_len); | |
42 | + #else | |
43 | static bool (*Perl_sv_2bool)(pTHX_ SV*); | |
44 | + #endif | |
45 | static IV (*Perl_sv_2iv)(pTHX_ SV*); | |
46 | static SV* (*Perl_sv_2mortal)(pTHX_ SV*); | |
47 | #if (PERL_REVISION == 5) && (PERL_VERSION >= 8) | |
48 | *************** | |
49 | *** 360,366 **** | |
50 | --- 370,381 ---- | |
51 | {"Perl_save_int", (PERL_PROC*)&Perl_save_int}, | |
52 | {"Perl_stack_grow", (PERL_PROC*)&Perl_stack_grow}, | |
53 | {"Perl_set_context", (PERL_PROC*)&Perl_set_context}, | |
54 | + #if (PERL_REVISION == 5) && (PERL_VERSION >= 14) | |
55 | + {"Perl_sv_2bool_flags", (PERL_PROC*)&Perl_sv_2bool_flags}, | |
56 | + {"Perl_xs_apiversion_bootcheck",(PERL_PROC*)&Perl_xs_apiversion_bootcheck}, | |
57 | + #else | |
58 | {"Perl_sv_2bool", (PERL_PROC*)&Perl_sv_2bool}, | |
59 | + #endif | |
60 | {"Perl_sv_2iv", (PERL_PROC*)&Perl_sv_2iv}, | |
61 | {"Perl_sv_2mortal", (PERL_PROC*)&Perl_sv_2mortal}, | |
62 | #if (PERL_REVISION == 5) && (PERL_VERSION >= 8) | |
63 | *************** | |
64 | *** 407,412 **** | |
65 | --- 422,430 ---- | |
66 | {"Perl_sv_free2", (PERL_PROC*)&Perl_sv_free2}, | |
67 | {"Perl_sys_init", (PERL_PROC*)&Perl_sys_init}, | |
68 | {"Perl_sys_term", (PERL_PROC*)&Perl_sys_term}, | |
69 | + {"Perl_call_list", (PERL_PROC*)&Perl_call_list}, | |
70 | + # if (PERL_REVISION == 5) && (PERL_VERSION >= 14) | |
71 | + # else | |
72 | {"Perl_ISv_ptr", (PERL_PROC*)&Perl_ISv_ptr}, | |
73 | {"Perl_Istack_max_ptr", (PERL_PROC*)&Perl_Istack_max_ptr}, | |
74 | {"Perl_Istack_base_ptr", (PERL_PROC*)&Perl_Istack_base_ptr}, | |
75 | *************** | |
76 | *** 418,432 **** | |
77 | {"Perl_Imarkstack_max_ptr", (PERL_PROC*)&Perl_Imarkstack_max_ptr}, | |
78 | {"Perl_Istack_sp_ptr", (PERL_PROC*)&Perl_Istack_sp_ptr}, | |
79 | {"Perl_Iop_ptr", (PERL_PROC*)&Perl_Iop_ptr}, | |
80 | - {"Perl_call_list", (PERL_PROC*)&Perl_call_list}, | |
81 | {"Perl_Iscopestack_ix_ptr", (PERL_PROC*)&Perl_Iscopestack_ix_ptr}, | |
82 | {"Perl_Iunitcheckav_ptr", (PERL_PROC*)&Perl_Iunitcheckav_ptr}, | |
83 | #endif | |
84 | {"Perl_Idefgv_ptr", (PERL_PROC*)&Perl_Idefgv_ptr}, | |
85 | {"Perl_Ierrgv_ptr", (PERL_PROC*)&Perl_Ierrgv_ptr}, | |
86 | {"Perl_Isv_yes_ptr", (PERL_PROC*)&Perl_Isv_yes_ptr}, | |
87 | - {"boot_DynaLoader", (PERL_PROC*)&boot_DynaLoader}, | |
88 | {"Perl_Gthr_key_ptr", (PERL_PROC*)&Perl_Gthr_key_ptr}, | |
89 | {"", NULL}, | |
90 | }; | |
91 | ||
92 | --- 436,453 ---- | |
93 | {"Perl_Imarkstack_max_ptr", (PERL_PROC*)&Perl_Imarkstack_max_ptr}, | |
94 | {"Perl_Istack_sp_ptr", (PERL_PROC*)&Perl_Istack_sp_ptr}, | |
95 | {"Perl_Iop_ptr", (PERL_PROC*)&Perl_Iop_ptr}, | |
96 | {"Perl_Iscopestack_ix_ptr", (PERL_PROC*)&Perl_Iscopestack_ix_ptr}, | |
97 | {"Perl_Iunitcheckav_ptr", (PERL_PROC*)&Perl_Iunitcheckav_ptr}, | |
98 | + # endif | |
99 | #endif | |
100 | + #if (PERL_REVISION == 5) && (PERL_VERSION >= 14) | |
101 | + #else | |
102 | {"Perl_Idefgv_ptr", (PERL_PROC*)&Perl_Idefgv_ptr}, | |
103 | {"Perl_Ierrgv_ptr", (PERL_PROC*)&Perl_Ierrgv_ptr}, | |
104 | {"Perl_Isv_yes_ptr", (PERL_PROC*)&Perl_Isv_yes_ptr}, | |
105 | {"Perl_Gthr_key_ptr", (PERL_PROC*)&Perl_Gthr_key_ptr}, | |
106 | + #endif | |
107 | + {"boot_DynaLoader", (PERL_PROC*)&boot_DynaLoader}, | |
108 | {"", NULL}, | |
109 | }; | |
110 | ||
111 | *** ../vim-7.3.296/src/version.c 2011-09-07 15:04:26.000000000 +0200 | |
112 | --- src/version.c 2011-09-07 18:45:28.000000000 +0200 | |
113 | *************** | |
114 | *** 711,712 **** | |
115 | --- 711,714 ---- | |
116 | { /* Add new patch number below this line */ | |
117 | + /**/ | |
118 | + 297, | |
119 | /**/ | |
120 | ||
121 | -- | |
122 | At some point in the project somebody will start whining about the need to | |
123 | determine the project "requirements". This involves interviewing people who | |
124 | don't know what they want but, curiously, know exactly when they need it. | |
125 | (Scott Adams - The Dilbert principle) | |
126 | ||
127 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
128 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
129 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
130 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |