- patchlevel 1198

2013-07-04 15:35:56 +02:00 · 2013-07-04 15:35:56 +02:00 · 1db855955d
commit 1db855955d
parent 9891cc8fcf
1 changed files with 91 additions and 0 deletions
--- a/7.3.1198
+++ b/7.3.1198
@ -0,0 +1,91 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.3.1198
+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.3.1198
+Problem:    Build error when using Perl 5.18.0 and dynamic loading.
+Solution:   Change #ifdefs for Perl_croak_xs_usage. (Ike Devolder)
+Files:	    src/if_perl.xs
+
+
+*** ../vim-7.3.1197/src/if_perl.xs	2013-05-06 04:21:35.000000000 +0200
+--- src/if_perl.xs	2013-06-15 16:42:45.000000000 +0200
+***************
+*** 67,72 ****
+--- 67,76 ----
+  # define PERL5101_OR_LATER
+  #endif
+  
+ #if (PERL_REVISION == 5) && (PERL_VERSION >= 18)
+ # define PERL5180_OR_LATER
+ #endif
+ 
+  #ifndef pTHX
+  #    define pTHX void
+  #    define pTHX_
+***************
+*** 127,135 ****
+--- 131,141 ----
+  # define perl_free dll_perl_free
+  # define Perl_get_context dll_Perl_get_context
+  # define Perl_croak dll_Perl_croak
+ # ifndef PERL5180_OR_LATER
+  # ifdef PERL5101_OR_LATER
+  #  define Perl_croak_xs_usage dll_Perl_croak_xs_usage
+  # endif
+ # endif
+  # ifndef PROTO
+  #  define Perl_croak_nocontext dll_Perl_croak_nocontext
+  #  define Perl_call_argv dll_Perl_call_argv
+***************
+*** 242,250 ****
+--- 248,258 ----
+  static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
+  static void* (*Perl_get_context)(void);
+  static void (*Perl_croak)(pTHX_ const char*, ...);
+ #ifndef PERL5180_OR_LATER
+  #ifdef PERL5101_OR_LATER
+  static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params);
+  #endif
+ #endif
+  static void (*Perl_croak_nocontext)(const char*, ...);
+  static I32 (*Perl_dowantarray)(pTHX);
+  static void (*Perl_free_tmps)(pTHX);
+***************
+*** 362,370 ****
+--- 370,380 ----
+      {"perl_parse", (PERL_PROC*)&perl_parse},
+      {"Perl_get_context", (PERL_PROC*)&Perl_get_context},
+      {"Perl_croak", (PERL_PROC*)&Perl_croak},
+ #ifndef PERL5180_OR_LATER
+  #ifdef PERL5101_OR_LATER
+      {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage},
+  #endif
+ #endif
+      {"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext},
+      {"Perl_dowantarray", (PERL_PROC*)&Perl_dowantarray},
+      {"Perl_free_tmps", (PERL_PROC*)&Perl_free_tmps},
+*** ../vim-7.3.1197/src/version.c	2013-06-15 16:31:41.000000000 +0200
+--- src/version.c	2013-06-15 16:42:08.000000000 +0200
+***************
+*** 730,731 ****
+--- 730,733 ----
+  {   /* Add new patch number below this line */
+ /**/
+     1198,
+  /**/
+
+-- 
+I noticed my daughter's Disney-net password on a sticky note:
+"MickeyMinnieGoofyPluto".  I asked her why it was so long.
+"Because they say it has to have at least four characters."
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///