|
 |
d9d360a |
To: vim-dev@vim.org
|
|
|
d9d360a |
Subject: Patch 7.2.380
|
|
|
d9d360a |
Fcc: outbox
|
|
|
d9d360a |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d9d360a |
Mime-Version: 1.0
|
|
|
d9d360a |
Content-Type: text/plain; charset=UTF-8
|
|
|
d9d360a |
Content-Transfer-Encoding: 8bit
|
|
|
d9d360a |
------------
|
|
|
d9d360a |
|
|
|
d9d360a |
Patch 7.2.380 (after 7.2.363)
|
|
|
d9d360a |
Problem: Perl interface builds with 5.10.1 but not with 5.10.0.
|
|
|
d9d360a |
Solution: Change the #ifdefs. (Sergey Khorev)
|
|
|
d9d360a |
Files: src/if_perl.xs
|
|
|
d9d360a |
|
|
|
d9d360a |
|
|
|
d9d360a |
*** ../vim-7.2.379/src/if_perl.xs 2010-02-17 16:40:47.000000000 +0100
|
|
|
d9d360a |
--- src/if_perl.xs 2010-03-02 15:07:01.000000000 +0100
|
|
|
d9d360a |
***************
|
|
|
d9d360a |
*** 62,67 ****
|
|
|
d9d360a |
--- 62,72 ----
|
|
|
d9d360a |
# define PERL589_OR_LATER
|
|
|
d9d360a |
#endif
|
|
|
d9d360a |
|
|
|
d9d360a |
+ #if (PERL_REVISION == 5) && ((PERL_VERSION > 10) || \
|
|
|
d9d360a |
+ (PERL_VERSION == 10) && (PERL_SUBVERSION >= 1))
|
|
|
d9d360a |
+ # define PERL5101_OR_LATER
|
|
|
d9d360a |
+ #endif
|
|
|
d9d360a |
+
|
|
|
d9d360a |
#ifndef pTHX
|
|
|
d9d360a |
# define pTHX void
|
|
|
d9d360a |
# define pTHX_
|
|
|
d9d360a |
***************
|
|
|
d9d360a |
*** 93,99 ****
|
|
|
d9d360a |
# define perl_free dll_perl_free
|
|
|
d9d360a |
# define Perl_get_context dll_Perl_get_context
|
|
|
d9d360a |
# define Perl_croak dll_Perl_croak
|
|
|
d9d360a |
! # if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
|
|
|
d9d360a |
# define Perl_croak_xs_usage dll_Perl_croak_xs_usage
|
|
|
d9d360a |
# endif
|
|
|
d9d360a |
# ifndef PROTO
|
|
|
d9d360a |
--- 98,104 ----
|
|
|
d9d360a |
# define perl_free dll_perl_free
|
|
|
d9d360a |
# define Perl_get_context dll_Perl_get_context
|
|
|
d9d360a |
# define Perl_croak dll_Perl_croak
|
|
|
d9d360a |
! # ifdef PERL5101_OR_LATER
|
|
|
d9d360a |
# define Perl_croak_xs_usage dll_Perl_croak_xs_usage
|
|
|
d9d360a |
# endif
|
|
|
d9d360a |
# ifndef PROTO
|
|
|
d9d360a |
***************
|
|
|
d9d360a |
*** 205,211 ****
|
|
|
d9d360a |
static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
|
|
|
d9d360a |
static void* (*Perl_get_context)(void);
|
|
|
d9d360a |
static void (*Perl_croak)(pTHX_ const char*, ...);
|
|
|
d9d360a |
! #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
|
|
|
d9d360a |
static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params);
|
|
|
d9d360a |
#endif
|
|
|
d9d360a |
static void (*Perl_croak_nocontext)(const char*, ...);
|
|
|
d9d360a |
--- 210,216 ----
|
|
|
d9d360a |
static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
|
|
|
d9d360a |
static void* (*Perl_get_context)(void);
|
|
|
d9d360a |
static void (*Perl_croak)(pTHX_ const char*, ...);
|
|
|
d9d360a |
! #ifdef PERL5101_OR_LATER
|
|
|
d9d360a |
static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params);
|
|
|
d9d360a |
#endif
|
|
|
d9d360a |
static void (*Perl_croak_nocontext)(const char*, ...);
|
|
|
d9d360a |
***************
|
|
|
d9d360a |
*** 312,318 ****
|
|
|
d9d360a |
{"perl_parse", (PERL_PROC*)&perl_parse},
|
|
|
d9d360a |
{"Perl_get_context", (PERL_PROC*)&Perl_get_context},
|
|
|
d9d360a |
{"Perl_croak", (PERL_PROC*)&Perl_croak},
|
|
|
d9d360a |
! #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
|
|
|
d9d360a |
{"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage},
|
|
|
d9d360a |
#endif
|
|
|
d9d360a |
{"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext},
|
|
|
d9d360a |
--- 317,323 ----
|
|
|
d9d360a |
{"perl_parse", (PERL_PROC*)&perl_parse},
|
|
|
d9d360a |
{"Perl_get_context", (PERL_PROC*)&Perl_get_context},
|
|
|
d9d360a |
{"Perl_croak", (PERL_PROC*)&Perl_croak},
|
|
|
d9d360a |
! #ifdef PERL5101_OR_LATER
|
|
|
d9d360a |
{"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage},
|
|
|
d9d360a |
#endif
|
|
|
d9d360a |
{"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext},
|
|
|
d9d360a |
*** ../vim-7.2.379/src/version.c 2010-03-02 12:47:58.000000000 +0100
|
|
|
d9d360a |
--- src/version.c 2010-03-02 15:13:21.000000000 +0100
|
|
|
d9d360a |
***************
|
|
|
d9d360a |
*** 683,684 ****
|
|
|
d9d360a |
--- 683,686 ----
|
|
|
d9d360a |
{ /* Add new patch number below this line */
|
|
|
d9d360a |
+ /**/
|
|
|
d9d360a |
+ 380,
|
|
|
d9d360a |
/**/
|
|
|
d9d360a |
|
|
|
d9d360a |
--
|
|
|
d9d360a |
FATHER: Make sure the Prince doesn't leave this room until I come and
|
|
|
d9d360a |
get him.
|
|
|
d9d360a |
FIRST GUARD: Not ... to leave the room ... even if you come and get him.
|
|
|
d9d360a |
FATHER: No. Until I come and get him.
|
|
|
d9d360a |
SECOND GUARD: Hic.
|
|
|
d9d360a |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
d9d360a |
|
|
|
d9d360a |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d9d360a |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d9d360a |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
d9d360a |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|