projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 8587d00a AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.380 | |
| 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.2.380 (after 7.2.363) | |
| 11 | Problem: Perl interface builds with 5.10.1 but not with 5.10.0. | |
| 12 | Solution: Change the #ifdefs. (Sergey Khorev) | |
| 13 | Files: src/if_perl.xs | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.379/src/if_perl.xs 2010-02-17 16:40:47.000000000 +0100 | |
| 17 | --- src/if_perl.xs 2010-03-02 15:07:01.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 62,67 **** | |
| 20 | --- 62,72 ---- | |
| 21 | # define PERL589_OR_LATER | |
| 22 | #endif | |
| 23 | ||
| 24 | + #if (PERL_REVISION == 5) && ((PERL_VERSION > 10) || \ | |
| 25 | + (PERL_VERSION == 10) && (PERL_SUBVERSION >= 1)) | |
| 26 | + # define PERL5101_OR_LATER | |
| 27 | + #endif | |
| 28 | + | |
| 29 | #ifndef pTHX | |
| 30 | # define pTHX void | |
| 31 | # define pTHX_ | |
| 32 | *************** | |
| 33 | *** 93,99 **** | |
| 34 | # define perl_free dll_perl_free | |
| 35 | # define Perl_get_context dll_Perl_get_context | |
| 36 | # define Perl_croak dll_Perl_croak | |
| 37 | ! # if (PERL_REVISION == 5) && (PERL_VERSION >= 10) | |
| 38 | # define Perl_croak_xs_usage dll_Perl_croak_xs_usage | |
| 39 | # endif | |
| 40 | # ifndef PROTO | |
| 41 | --- 98,104 ---- | |
| 42 | # define perl_free dll_perl_free | |
| 43 | # define Perl_get_context dll_Perl_get_context | |
| 44 | # define Perl_croak dll_Perl_croak | |
| 45 | ! # ifdef PERL5101_OR_LATER | |
| 46 | # define Perl_croak_xs_usage dll_Perl_croak_xs_usage | |
| 47 | # endif | |
| 48 | # ifndef PROTO | |
| 49 | *************** | |
| 50 | *** 205,211 **** | |
| 51 | static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**); | |
| 52 | static void* (*Perl_get_context)(void); | |
| 53 | static void (*Perl_croak)(pTHX_ const char*, ...); | |
| 54 | ! #if (PERL_REVISION == 5) && (PERL_VERSION >= 10) | |
| 55 | static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params); | |
| 56 | #endif | |
| 57 | static void (*Perl_croak_nocontext)(const char*, ...); | |
| 58 | --- 210,216 ---- | |
| 59 | static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**); | |
| 60 | static void* (*Perl_get_context)(void); | |
| 61 | static void (*Perl_croak)(pTHX_ const char*, ...); | |
| 62 | ! #ifdef PERL5101_OR_LATER | |
| 63 | static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params); | |
| 64 | #endif | |
| 65 | static void (*Perl_croak_nocontext)(const char*, ...); | |
| 66 | *************** | |
| 67 | *** 312,318 **** | |
| 68 | {"perl_parse", (PERL_PROC*)&perl_parse}, | |
| 69 | {"Perl_get_context", (PERL_PROC*)&Perl_get_context}, | |
| 70 | {"Perl_croak", (PERL_PROC*)&Perl_croak}, | |
| 71 | ! #if (PERL_REVISION == 5) && (PERL_VERSION >= 10) | |
| 72 | {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage}, | |
| 73 | #endif | |
| 74 | {"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext}, | |
| 75 | --- 317,323 ---- | |
| 76 | {"perl_parse", (PERL_PROC*)&perl_parse}, | |
| 77 | {"Perl_get_context", (PERL_PROC*)&Perl_get_context}, | |
| 78 | {"Perl_croak", (PERL_PROC*)&Perl_croak}, | |
| 79 | ! #ifdef PERL5101_OR_LATER | |
| 80 | {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage}, | |
| 81 | #endif | |
| 82 | {"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext}, | |
| 83 | *** ../vim-7.2.379/src/version.c 2010-03-02 12:47:58.000000000 +0100 | |
| 84 | --- src/version.c 2010-03-02 15:13:21.000000000 +0100 | |
| 85 | *************** | |
| 86 | *** 683,684 **** | |
| 87 | --- 683,686 ---- | |
| 88 | { /* Add new patch number below this line */ | |
| 89 | + /**/ | |
| 90 | + 380, | |
| 91 | /**/ | |
| 92 | ||
| 93 | -- | |
| 94 | FATHER: Make sure the Prince doesn't leave this room until I come and | |
| 95 | get him. | |
| 96 | FIRST GUARD: Not ... to leave the room ... even if you come and get him. | |
| 97 | FATHER: No. Until I come and get him. | |
| 98 | SECOND GUARD: Hic. | |
| 99 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 100 | ||
| 101 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 102 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 103 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 104 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |