To: vim-dev@vim.org

Subject: Patch 7.2.380

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.2.380 (after 7.2.363)

Problem:    Perl interface builds with 5.10.1 but not with 5.10.0.

Solution:   Change the #ifdefs. (Sergey Khorev)

Files:	    src/if_perl.xs

*** ../vim-7.2.379/src/if_perl.xs	2010-02-17 16:40:47.000000000 +0100

--- src/if_perl.xs	2010-03-02 15:07:01.000000000 +0100

***************

*** 62,67 ****

--- 62,72 ----

  # define PERL589_OR_LATER

  #endif

+ #if (PERL_REVISION == 5) && ((PERL_VERSION > 10) || \

+     (PERL_VERSION == 10) && (PERL_SUBVERSION >= 1))

+ # define PERL5101_OR_LATER

+ #endif

+ 

  #ifndef pTHX

  #    define pTHX void

  #    define pTHX_

***************

*** 93,99 ****

  # define perl_free dll_perl_free

  # define Perl_get_context dll_Perl_get_context

  # define Perl_croak dll_Perl_croak

! # if (PERL_REVISION == 5) && (PERL_VERSION >= 10)

  #  define Perl_croak_xs_usage dll_Perl_croak_xs_usage

  # endif

  # ifndef PROTO

--- 98,104 ----

  # define perl_free dll_perl_free

  # define Perl_get_context dll_Perl_get_context

  # define Perl_croak dll_Perl_croak

! # ifdef PERL5101_OR_LATER

  #  define Perl_croak_xs_usage dll_Perl_croak_xs_usage

  # endif

  # ifndef PROTO

***************

*** 205,211 ****

  static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);

  static void* (*Perl_get_context)(void);

  static void (*Perl_croak)(pTHX_ const char*, ...);

! #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)

  static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params);

  #endif

  static void (*Perl_croak_nocontext)(const char*, ...);

--- 210,216 ----

  static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);

  static void* (*Perl_get_context)(void);

  static void (*Perl_croak)(pTHX_ const char*, ...);

! #ifdef PERL5101_OR_LATER

  static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params);

  #endif

  static void (*Perl_croak_nocontext)(const char*, ...);

***************

*** 312,318 ****

      {"perl_parse", (PERL_PROC*)&perl_parse},

      {"Perl_get_context", (PERL_PROC*)&Perl_get_context},

      {"Perl_croak", (PERL_PROC*)&Perl_croak},

! #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)

      {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage},

  #endif

      {"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext},

--- 317,323 ----

      {"perl_parse", (PERL_PROC*)&perl_parse},

      {"Perl_get_context", (PERL_PROC*)&Perl_get_context},

      {"Perl_croak", (PERL_PROC*)&Perl_croak},

! #ifdef PERL5101_OR_LATER

      {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage},

  #endif

      {"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext},

*** ../vim-7.2.379/src/version.c	2010-03-02 12:47:58.000000000 +0100

--- src/version.c	2010-03-02 15:13:21.000000000 +0100

***************

*** 683,684 ****

--- 683,686 ----

  {   /* Add new patch number below this line */

+ /**/

+     380,

  /**/

-- 

FATHER:       Make sure the Prince doesn't leave this room until I come and

              get him.

FIRST GUARD:  Not ... to leave the room ... even if you come and get him.

FATHER:       No.  Until I come and get him.

SECOND GUARD: Hic.

                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// 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    ///