In perl.git, the branch smoke-me/sys_intern has been updated <http://perl5.git.perl.org/perl.git/commitdiff/9dc9f8ada10e9b57411885614636eb1b87e5c2a4?hp=2c247e84d4c0ff4b5c5fe6c10b3257c55520332a>
- Log ----------------------------------------------------------------- commit 9dc9f8ada10e9b57411885614636eb1b87e5c2a4 Author: Nicholas Clark <[email protected]> Date: Mon Jul 18 19:49:28 2011 +0100 In the PERL_IMPLICIT_SYS section in perl_free(), use fewer CPP directives. The diff is actually confusing to look at - the code itself makes things a lot clearer: # ifdef NETWARE void *host = nw_internal_host; PerlMem_free(aTHXx); nw_delete_internal_host(host); # else void *host = w32_internal_host; PerlMem_free(aTHXx); win32_delete_internal_host(host); # endif M perl.c commit 1444a2098db15f708308315016df4485718c0906 Author: Nicholas Clark <[email protected]> Date: Mon Jul 18 18:31:55 2011 +0100 In embed.fnc, reorder the symbols conditional on HAVE_INTERP_INTERP. This reordering removes 2 pre-processor directives. M embed.fnc ----------------------------------------------------------------------- Summary of changes: embed.fnc | 8 +++----- perl.c | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/embed.fnc b/embed.fnc index ab2cdec..16285ac 100644 --- a/embed.fnc +++ b/embed.fnc @@ -1678,14 +1678,12 @@ Ap |void |ptr_table_store|NN PTR_TBL_t *const tbl|NULLOK const void *const oldsv Ap |void |ptr_table_split|NN PTR_TBL_t *const tbl ApD |void |ptr_table_clear|NULLOK PTR_TBL_t *const tbl Ap |void |ptr_table_free|NULLOK PTR_TBL_t *const tbl -#if defined(USE_ITHREADS) -# if defined(HAVE_INTERP_INTERN) -Ap |void |sys_intern_dup |NN struct interp_intern* src|NN struct interp_intern* dst -# endif -#endif #if defined(HAVE_INTERP_INTERN) Ap |void |sys_intern_clear Ap |void |sys_intern_init +# if defined(USE_ITHREADS) +Ap |void |sys_intern_dup |NN struct interp_intern* src|NN struct interp_intern* dst +# endif #endif AopP |const XOP * |custom_op_xop |NN const OP *o diff --git a/perl.c b/perl.c index 8444218..63b58cf 100644 --- a/perl.c +++ b/perl.c @@ -1320,13 +1320,11 @@ perl_free(pTHXx) { # ifdef NETWARE void *host = nw_internal_host; -# else - void *host = w32_internal_host; -# endif PerlMem_free(aTHXx); -# ifdef NETWARE nw_delete_internal_host(host); # else + void *host = w32_internal_host; + PerlMem_free(aTHXx); win32_delete_internal_host(host); # endif } -- Perl5 Master Repository
