X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=objXSUB.h;h=564bd9c4ab66cb9ac169605c3c231fbca30e4ac8;hb=b7711e741569c03e279a3607f6b4e22eb5665f90;hp=5867ed279bb03ef78cff89b43682aa8215e7e322;hpb=a567e93b903bc9849952c06533059c2f2e2fb226;p=p5sagit%2Fp5-mst-13.2.git diff --git a/objXSUB.h b/objXSUB.h index 5867ed2..564bd9c 100644 --- a/objXSUB.h +++ b/objXSUB.h @@ -228,6 +228,10 @@ #define Perl_fprintf_nocontext pPerl->Perl_fprintf_nocontext #undef fprintf_nocontext #define fprintf_nocontext Perl_fprintf_nocontext +#undef Perl_printf_nocontext +#define Perl_printf_nocontext pPerl->Perl_printf_nocontext +#undef printf_nocontext +#define printf_nocontext Perl_printf_nocontext #endif #undef Perl_cv_const_sv #define Perl_cv_const_sv pPerl->Perl_cv_const_sv @@ -575,6 +579,10 @@ #define Perl_init_stacks pPerl->Perl_init_stacks #undef init_stacks #define init_stacks Perl_init_stacks +#undef Perl_init_tm +#define Perl_init_tm pPerl->Perl_init_tm +#undef init_tm +#define init_tm Perl_init_tm #undef Perl_instr #define Perl_instr pPerl->Perl_instr #undef instr @@ -787,6 +795,10 @@ #define Perl_leave_scope pPerl->Perl_leave_scope #undef leave_scope #define leave_scope Perl_leave_scope +#undef Perl_op_null +#define Perl_op_null pPerl->Perl_op_null +#undef op_null +#define op_null Perl_op_null #undef Perl_load_module #define Perl_load_module pPerl->Perl_load_module #undef load_module @@ -799,6 +811,14 @@ #define Perl_looks_like_number pPerl->Perl_looks_like_number #undef looks_like_number #define looks_like_number Perl_looks_like_number +#undef Perl_grok_number +#define Perl_grok_number pPerl->Perl_grok_number +#undef grok_number +#define grok_number Perl_grok_number +#undef Perl_grok_numeric_radix +#define Perl_grok_numeric_radix pPerl->Perl_grok_numeric_radix +#undef grok_numeric_radix +#define grok_numeric_radix Perl_grok_numeric_radix #if defined(USE_THREADS) #endif #if defined(USE_LOCALE_COLLATE) @@ -853,6 +873,10 @@ #define Perl_mg_size pPerl->Perl_mg_size #undef mg_size #define mg_size Perl_mg_size +#undef Perl_mini_mktime +#define Perl_mini_mktime pPerl->Perl_mini_mktime +#undef mini_mktime +#define mini_mktime Perl_mini_mktime #undef Perl_moreswitches #define Perl_moreswitches pPerl->Perl_moreswitches #undef moreswitches @@ -861,7 +885,7 @@ #define Perl_my_atof pPerl->Perl_my_atof #undef my_atof #define my_atof Perl_my_atof -#if !defined(HAS_BCOPY) || !defined(HAS_SAFE_BCOPY) +#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY)) #undef Perl_my_bcopy #define Perl_my_bcopy pPerl->Perl_my_bcopy #undef my_bcopy @@ -885,6 +909,18 @@ #define Perl_my_fflush_all pPerl->Perl_my_fflush_all #undef my_fflush_all #define my_fflush_all Perl_my_fflush_all +#undef Perl_my_fork +#define Perl_my_fork pPerl->Perl_my_fork +#undef my_fork +#define my_fork Perl_my_fork +#undef Perl_atfork_lock +#define Perl_atfork_lock pPerl->Perl_atfork_lock +#undef atfork_lock +#define atfork_lock Perl_atfork_lock +#undef Perl_atfork_unlock +#define Perl_atfork_unlock pPerl->Perl_atfork_unlock +#undef atfork_unlock +#define atfork_unlock Perl_atfork_unlock #undef Perl_my_lstat #define Perl_my_lstat pPerl->Perl_my_lstat #undef my_lstat @@ -910,6 +946,10 @@ #define Perl_my_popen pPerl->Perl_my_popen #undef my_popen #define my_popen Perl_my_popen +#undef Perl_my_popen_list +#define Perl_my_popen_list pPerl->Perl_my_popen_list +#undef my_popen_list +#define my_popen_list Perl_my_popen_list #endif #undef Perl_my_setenv #define Perl_my_setenv pPerl->Perl_my_setenv @@ -919,6 +959,10 @@ #define Perl_my_stat pPerl->Perl_my_stat #undef my_stat #define my_stat Perl_my_stat +#undef Perl_my_strftime +#define Perl_my_strftime pPerl->Perl_my_strftime +#undef my_strftime +#define my_strftime Perl_my_strftime #if defined(MYSWAP) #undef Perl_my_swap #define Perl_my_swap pPerl->Perl_my_swap @@ -1311,6 +1355,10 @@ #define Perl_rsignal pPerl->Perl_rsignal #undef rsignal #define rsignal Perl_rsignal +#undef Perl_rsignal_state +#define Perl_rsignal_state pPerl->Perl_rsignal_state +#undef rsignal_state +#define rsignal_state Perl_rsignal_state #if !defined(HAS_RENAME) #endif #undef Perl_savepv @@ -1425,6 +1473,10 @@ #define Perl_save_long pPerl->Perl_save_long #undef save_long #define save_long Perl_save_long +#undef Perl_save_mortalizesv +#define Perl_save_mortalizesv pPerl->Perl_save_mortalizesv +#undef save_mortalizesv +#define save_mortalizesv Perl_save_mortalizesv #undef Perl_save_nogv #define Perl_save_nogv pPerl->Perl_save_nogv #undef save_nogv @@ -1617,6 +1669,10 @@ #define Perl_sv_compile_2op pPerl->Perl_sv_compile_2op #undef sv_compile_2op #define sv_compile_2op Perl_sv_compile_2op +#undef Perl_getcwd_sv +#define Perl_getcwd_sv pPerl->Perl_getcwd_sv +#undef getcwd_sv +#define getcwd_sv Perl_getcwd_sv #undef Perl_sv_dec #define Perl_sv_dec pPerl->Perl_sv_dec #undef sv_dec @@ -1753,6 +1809,10 @@ #define Perl_sv_setref_iv pPerl->Perl_sv_setref_iv #undef sv_setref_iv #define sv_setref_iv Perl_sv_setref_iv +#undef Perl_sv_setref_uv +#define Perl_sv_setref_uv pPerl->Perl_sv_setref_uv +#undef sv_setref_uv +#define sv_setref_uv Perl_sv_setref_uv #undef Perl_sv_setref_nv #define Perl_sv_setref_nv pPerl->Perl_sv_setref_nv #undef sv_setref_nv @@ -1889,22 +1949,38 @@ #define Perl_utf8_to_bytes pPerl->Perl_utf8_to_bytes #undef utf8_to_bytes #define utf8_to_bytes Perl_utf8_to_bytes +#undef Perl_bytes_from_utf8 +#define Perl_bytes_from_utf8 pPerl->Perl_bytes_from_utf8 +#undef bytes_from_utf8 +#define bytes_from_utf8 Perl_bytes_from_utf8 #undef Perl_bytes_to_utf8 #define Perl_bytes_to_utf8 pPerl->Perl_bytes_to_utf8 #undef bytes_to_utf8 #define bytes_to_utf8 Perl_bytes_to_utf8 -#undef Perl_utf8_to_uv_simple -#define Perl_utf8_to_uv_simple pPerl->Perl_utf8_to_uv_simple -#undef utf8_to_uv_simple -#define utf8_to_uv_simple Perl_utf8_to_uv_simple -#undef Perl_utf8_to_uv -#define Perl_utf8_to_uv pPerl->Perl_utf8_to_uv -#undef utf8_to_uv -#define utf8_to_uv Perl_utf8_to_uv -#undef Perl_uv_to_utf8 -#define Perl_uv_to_utf8 pPerl->Perl_uv_to_utf8 -#undef uv_to_utf8 -#define uv_to_utf8 Perl_uv_to_utf8 +#undef Perl_utf8_to_uvchr +#define Perl_utf8_to_uvchr pPerl->Perl_utf8_to_uvchr +#undef utf8_to_uvchr +#define utf8_to_uvchr Perl_utf8_to_uvchr +#undef Perl_utf8_to_uvuni +#define Perl_utf8_to_uvuni pPerl->Perl_utf8_to_uvuni +#undef utf8_to_uvuni +#define utf8_to_uvuni Perl_utf8_to_uvuni +#undef Perl_utf8n_to_uvchr +#define Perl_utf8n_to_uvchr pPerl->Perl_utf8n_to_uvchr +#undef utf8n_to_uvchr +#define utf8n_to_uvchr Perl_utf8n_to_uvchr +#undef Perl_utf8n_to_uvuni +#define Perl_utf8n_to_uvuni pPerl->Perl_utf8n_to_uvuni +#undef utf8n_to_uvuni +#define utf8n_to_uvuni Perl_utf8n_to_uvuni +#undef Perl_uvchr_to_utf8 +#define Perl_uvchr_to_utf8 pPerl->Perl_uvchr_to_utf8 +#undef uvchr_to_utf8 +#define uvchr_to_utf8 Perl_uvchr_to_utf8 +#undef Perl_uvuni_to_utf8 +#define Perl_uvuni_to_utf8 pPerl->Perl_uvuni_to_utf8 +#undef uvuni_to_utf8 +#define uvuni_to_utf8 Perl_uvuni_to_utf8 #undef Perl_warn #define Perl_warn pPerl->Perl_warn #undef warn @@ -1926,7 +2002,6 @@ #undef whichsig #define whichsig Perl_whichsig #ifdef USE_PURE_BISON -#else #endif #if defined(MYMALLOC) #undef Perl_dump_mstats @@ -2245,6 +2320,14 @@ #define Perl_ptr_table_split pPerl->Perl_ptr_table_split #undef ptr_table_split #define ptr_table_split Perl_ptr_table_split +#undef Perl_ptr_table_clear +#define Perl_ptr_table_clear pPerl->Perl_ptr_table_clear +#undef ptr_table_clear +#define ptr_table_clear Perl_ptr_table_clear +#undef Perl_ptr_table_free +#define Perl_ptr_table_free pPerl->Perl_ptr_table_free +#undef ptr_table_free +#define ptr_table_free Perl_ptr_table_free #endif #if defined(HAVE_INTERP_INTERN) #undef Perl_sys_intern_clear @@ -2270,6 +2353,8 @@ #if defined(PERL_IN_MG_C) || defined(PERL_DECL_PROT) #endif #if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) +# if defined(DEBUG_CLOSURES) +# endif # if defined(PL_OP_SLAB_ALLOC) # endif #endif @@ -2283,6 +2368,8 @@ #endif #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT) #endif +#if defined(PERL_IN_PP_PACK_C) || defined(PERL_DECL_PROT) +#endif #if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT) #if defined(PERL_FLEXIBLE_EXCEPTIONS) #endif @@ -2294,20 +2381,28 @@ # endif #endif #if defined(PERL_IN_REGCOMP_C) || defined(PERL_DECL_PROT) +# ifdef DEBUGGING +# endif #endif #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT) #endif #if defined(PERL_IN_RUN_C) || defined(PERL_DECL_PROT) +# ifdef DEBUGGING +# endif #endif #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT) #endif #if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) -# if defined(DEBUGGING) +# ifdef DEBUGGING # endif # if !defined(NV_PRESERVES_UV) # endif +# if defined(USE_ITHREADS) +# endif #endif #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT) +# if defined(DEBUGGING) +# endif #if 0 #endif # if defined(CRIPPLED_CC) @@ -2317,12 +2412,42 @@ #endif #if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT) #endif +#if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT) +#endif #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) # if defined(LEAKTEST) # endif #endif #if defined(PERL_OBJECT) #endif +#undef Perl_sv_setsv_flags +#define Perl_sv_setsv_flags pPerl->Perl_sv_setsv_flags +#undef sv_setsv_flags +#define sv_setsv_flags Perl_sv_setsv_flags +#undef Perl_sv_catpvn_flags +#define Perl_sv_catpvn_flags pPerl->Perl_sv_catpvn_flags +#undef sv_catpvn_flags +#define sv_catpvn_flags Perl_sv_catpvn_flags +#undef Perl_sv_catsv_flags +#define Perl_sv_catsv_flags pPerl->Perl_sv_catsv_flags +#undef sv_catsv_flags +#define sv_catsv_flags Perl_sv_catsv_flags +#undef Perl_sv_utf8_upgrade_flags +#define Perl_sv_utf8_upgrade_flags pPerl->Perl_sv_utf8_upgrade_flags +#undef sv_utf8_upgrade_flags +#define sv_utf8_upgrade_flags Perl_sv_utf8_upgrade_flags +#undef Perl_sv_pvn_force_flags +#define Perl_sv_pvn_force_flags pPerl->Perl_sv_pvn_force_flags +#undef sv_pvn_force_flags +#define sv_pvn_force_flags Perl_sv_pvn_force_flags +#undef Perl_sv_2pv_flags +#define Perl_sv_2pv_flags pPerl->Perl_sv_2pv_flags +#undef sv_2pv_flags +#define sv_2pv_flags Perl_sv_2pv_flags +#undef Perl_my_atof2 +#define Perl_my_atof2 pPerl->Perl_my_atof2 +#undef my_atof2 +#define my_atof2 Perl_my_atof2 #endif /* PERL_CORE && PERL_OBJECT */ #endif /* __objXSUB_h__ */