2013年12月14日土曜日 5時26分41秒 UTC+9 Bram Moolenaar: > Kohei Suzuki wrote: > > > > > 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. > > > > This includes auto/config.h early, but then it's included again by > > vim.h. > > > > To avoid making things complicated, perhaps we can move these lines to > > an appropriate place inside vim.h: > > > > /* 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 > > > > E.g., where there is: > > > > #ifdef IN_PERL_FILE > > > > > > Or, if possible, move the lines to below including vim.h. Maybe you > > already tried that? > > > > > > -- > > hundred-and-one symptoms of being an internet addict: > > 53. To find out what time it is, you send yourself an e-mail and check the > > "Date:" field. > > > > /// 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 ///
I confirmed moving the lines to below vim.h also works. I agree that it's better. I updated the patch. -- -- 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..5a75147 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -24,13 +24,6 @@ # define _USE_32BIT_TIME_T #endif -/* 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 * already included before including winsock2.h, because winsock2.h isn't @@ -44,6 +37,13 @@ #include "vim.h" +/* 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 + #include <EXTERN.h> #include <perl.h> #include <XSUB.h>
