104 lines
3.2 KiB
Plaintext
104 lines
3.2 KiB
Plaintext
|
To: vim-dev@vim.org
|
||
|
|
Subject: patch 7.1.102
|
||
|
|
Fcc: outbox
|
||
|
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||
|
|
Mime-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=ISO-8859-1
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
------------
|
||
|
|
|
||
|
|
Patch 7.1.102
|
||
|
|
Problem: Perl interface doesn't compile with new version of Perl.
|
||
|
|
Solution: Add two variables to the dynamic library loading. (Suresh
|
||
|
|
Govindachar)
|
||
|
|
Files: src/if_perl.xs
|
||
|
|
|
||
|
|
|
||
|
|
*** ../vim-7.1.101/src/if_perl.xs Wed Aug 16 19:33:57 2006
|
||
|
|
--- src/if_perl.xs Wed Sep 5 22:00:36 2007
|
||
|
|
***************
|
||
|
|
*** 40,45 ****
|
||
|
|
--- 40,65 ----
|
||
|
|
# define PERL_SUBVERSION SUBVERSION
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+ /*
|
||
|
|
+ * Quoting Jan Dubois of Active State:
|
||
|
|
+ * ActivePerl build 822 still identifies itself as 5.8.8 but already
|
||
|
|
+ * contains many of the changes from the upcoming Perl 5.8.9 release.
|
||
|
|
+ *
|
||
|
|
+ * The changes include addition of two symbols (Perl_sv_2iv_flags,
|
||
|
|
+ * Perl_newXS_flags) not present in earlier releases.
|
||
|
|
+ *
|
||
|
|
+ * Jan Dubois suggested the following guarding scheme:
|
||
|
|
+ */
|
||
|
|
+ #if (ACTIVEPERL_VERSION >= 822)
|
||
|
|
+ # define PERL589_OR_LATER
|
||
|
|
+ #endif
|
||
|
|
+ #if (PERL_REVISION == 5) && (PERL_VERSION == 8) && (PERL_SUBVERSION >= 9)
|
||
|
|
+ # define PERL589_OR_LATER
|
||
|
|
+ #endif
|
||
|
|
+ #if (PERL_REVISION == 5) && (PERL_VERSION >= 9)
|
||
|
|
+ # define PERL589_OR_LATER
|
||
|
|
+ #endif
|
||
|
|
+
|
||
|
|
#ifndef pTHX
|
||
|
|
# define pTHX void
|
||
|
|
# define pTHX_
|
||
|
|
***************
|
||
|
|
*** 109,114 ****
|
||
|
|
--- 129,138 ----
|
||
|
|
# else
|
||
|
|
# define Perl_sv_catpvn dll_Perl_sv_catpvn
|
||
|
|
# endif
|
||
|
|
+ #ifdef PERL589_OR_LATER
|
||
|
|
+ # define Perl_sv_2iv_flags dll_Perl_sv_2iv_flags
|
||
|
|
+ # define Perl_newXS_flags dll_Perl_newXS_flags
|
||
|
|
+ #endif
|
||
|
|
# define Perl_sv_free dll_Perl_sv_free
|
||
|
|
# define Perl_sv_isa dll_Perl_sv_isa
|
||
|
|
# define Perl_sv_magic dll_Perl_sv_magic
|
||
|
|
***************
|
||
|
|
*** 192,197 ****
|
||
|
|
--- 216,225 ----
|
||
|
|
#else
|
||
|
|
static void (*Perl_sv_catpvn)(pTHX_ SV*, const char*, STRLEN);
|
||
|
|
#endif
|
||
|
|
+ #ifdef PERL589_OR_LATER
|
||
|
|
+ static IV (*Perl_sv_2iv_flags)(pTHX_ SV* sv, I32 flags);
|
||
|
|
+ static CV * (*Perl_newXS_flags)(pTHX_ const char *name, XSUBADDR_t subaddr, const char *const filename, const char *const proto, U32 flags);
|
||
|
|
+ #endif
|
||
|
|
static void (*Perl_sv_free)(pTHX_ SV*);
|
||
|
|
static int (*Perl_sv_isa)(pTHX_ SV*, const char*);
|
||
|
|
static void (*Perl_sv_magic)(pTHX_ SV*, SV*, int, const char*, I32);
|
||
|
|
***************
|
||
|
|
*** 266,271 ****
|
||
|
|
--- 294,303 ----
|
||
|
|
{"Perl_sv_2pv_nolen", (PERL_PROC*)&Perl_sv_2pv_nolen},
|
||
|
|
#else
|
||
|
|
{"Perl_sv_2pv", (PERL_PROC*)&Perl_sv_2pv},
|
||
|
|
+ #endif
|
||
|
|
+ #ifdef PERL589_OR_LATER
|
||
|
|
+ {"Perl_sv_2iv_flags", (PERL_PROC*)&Perl_sv_2iv_flags},
|
||
|
|
+ {"Perl_newXS_flags", (PERL_PROC*)&Perl_newXS_flags},
|
||
|
|
#endif
|
||
|
|
{"Perl_sv_bless", (PERL_PROC*)&Perl_sv_bless},
|
||
|
|
#if (PERL_REVISION == 5) && (PERL_VERSION >= 8)
|
||
|
|
*** ../vim-7.1.101/src/version.c Thu Sep 13 15:00:28 2007
|
||
|
|
--- src/version.c Thu Sep 13 15:18:36 2007
|
||
|
|
***************
|
||
|
|
*** 668,669 ****
|
||
|
|
--- 668,671 ----
|
||
|
|
{ /* Add new patch number below this line */
|
||
|
|
+ /**/
|
||
|
|
+ 102,
|
||
|
|
/**/
|
||
|
|
|
||
|
|
--
|
||
|
|
Witches prefer brooms: vacuum-cleaners need extension cords!
|
||
|
|
|
||
|
|
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
||
|
|
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
||
|
|
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
||
|
|
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|