2013年12月12日木曜日 1時20分36秒 UTC+9 Bram Moolenaar:
> Patch 7.4.120 (after 7.4.117)
> 
> Problem:    Can't build with Perl 5.18 on Linux. (Lcd 47)
> 
> Solution:   Add #ifdef. (Ken Takata)
> 
> Files:            src/if_perl.xs
> 
> 
> 
> 
> 
> *** ../vim-7.4.119/src/if_perl.xs     2013-12-11 15:06:36.000000000 +0100
> 
> --- src/if_perl.xs    2013-12-11 17:17:43.000000000 +0100
> 
> ***************
> 
> *** 27,33 ****
> 
>   /* Work around for perl-5.18.
> 
>    * Don't include "perl\lib\CORE\inline.h" for now,
> 
>    * include it after Perl_sv_free2 is defined. */
> 
> ! #define PERL_NO_INLINE_FUNCTIONS
> 
>   
> 
>   /*
> 
>    * Prevent including winsock.h.  perl.h tries to detect whether winsock.h is
> 
> --- 27,35 ----
> 
>   /* Work around for perl-5.18.
> 
>    * Don't include "perl\lib\CORE\inline.h" for now,
> 
>    * include it after Perl_sv_free2 is defined. */
> 
> ! #ifdef DYNAMIC_PERL
> 
> ! # define PERL_NO_INLINE_FUNCTIONS
> 
> ! #endif
> 
>   
> 
>   /*
> 
>    * Prevent including winsock.h.  perl.h tries to detect whether winsock.h is
> 
> *** ../vim-7.4.119/src/version.c      2013-12-11 17:12:32.000000000 +0100
> 
> --- src/version.c     2013-12-11 17:19:34.000000000 +0100
> 
> ***************
> 
> *** 740,741 ****
> 
> --- 740,743 ----
> 
>   {   /* Add new patch number below this line */
> 
> + /**/
> 
> +     120,
> 
>   /**/
> 
> 
> 
> -- 
> 
> Just remember...if the world didn't suck, we'd all fall off.
> 
> 
> 
>  /// Bram Moolenaar -- [email protected] -- 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    ///

Hi Bram,

After applying the above patch, building with --enable-perlinterp=dynamic fails.

The reason is that DYNAMIC_PERL is defined in auto/config.h, but auto/config.h 
isn't included yet at the patched position.
I attached a simple patch to include auto/config.h early.
Please check it.

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
diff --git a/src/if_perl.xs b/src/if_perl.xs
index 650aeb2..1ac2977 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -10,6 +10,10 @@
  *		Mostly written by Sven Verdoolaege.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "auto/config.h"
+#endif
+
 #define _memory_h	/* avoid memset redeclaration */
 #define IN_PERL_FILE	/* don't include if_perl.pro from proto.h */
 

Raspunde prin e-mail lui