X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=b5911b695e3d1b3d9a12ac066ea181633246d2b8;hb=0d86688dc4cee41db564627f19bab42e3d945cb6;hp=6778ea591860e8e453f22fb71dfb393b8c9f93a2;hpb=56b5603ec7962bbd71d2b0950444e5617e6c8329;p=p5sagit%2Fp5-mst-13.2.git diff --git a/embed.h b/embed.h index 6778ea5..b5911b6 100644 --- a/embed.h +++ b/embed.h @@ -3,7 +3,7 @@ * embed.h * * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, - * 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, by Larry Wall and others + * 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -123,7 +123,6 @@ #define printf_nocontext Perl_printf_nocontext #endif #ifdef PERL_CORE -#define cv_ckproto Perl_cv_ckproto #define cv_ckproto_len Perl_cv_ckproto_len #define cv_clone Perl_cv_clone #endif @@ -160,8 +159,12 @@ #define deprecate_old Perl_deprecate_old #endif #define die Perl_die +#if defined(PERL_IN_UTIL_C) +#ifdef PERL_CORE +#define vdie S_vdie +#endif +#endif #ifdef PERL_CORE -#define vdie Perl_vdie #define die_where Perl_die_where #endif #define dounwind Perl_dounwind @@ -248,14 +251,20 @@ #define fbm_instr Perl_fbm_instr #ifdef PERL_CORE #define find_script Perl_find_script -#define force_list Perl_force_list -#define fold_constants Perl_fold_constants +#endif +#if defined(PERL_IN_OP_C) +#ifdef PERL_CORE +#define force_list S_force_list +#define fold_constants S_fold_constants +#endif #endif #define form Perl_form #define vform Perl_vform #define free_tmps Perl_free_tmps +#if defined(PERL_IN_OP_C) #ifdef PERL_CORE -#define gen_constant_list Perl_gen_constant_list +#define gen_constant_list S_gen_constant_list +#endif #endif #if !defined(HAS_GETENV_LEN) #ifdef PERL_CORE @@ -306,8 +315,12 @@ #define ibcmp Perl_ibcmp #define ibcmp_locale Perl_ibcmp_locale #define ibcmp_utf8 Perl_ibcmp_utf8 +#if defined(PERL_IN_DOIO_C) +#ifdef PERL_CORE +#define ingroup S_ingroup +#endif +#endif #ifdef PERL_CORE -#define ingroup Perl_ingroup #define init_argv_symbols Perl_init_argv_symbols #define init_debugger Perl_init_debugger #endif @@ -320,7 +333,6 @@ #ifdef PERL_CORE #define io_close Perl_io_close #define invert Perl_invert -#define is_gv_magical Perl_is_gv_magical #endif #define is_lvalue_sub Perl_is_lvalue_sub #define to_uni_upper_lc Perl_to_uni_upper_lc @@ -394,10 +406,14 @@ #endif #define op_refcnt_lock Perl_op_refcnt_lock #define op_refcnt_unlock Perl_op_refcnt_unlock +#if defined(PERL_IN_OP_C) +#ifdef PERL_CORE +#define linklist S_linklist +#define listkids S_listkids +#endif +#endif #ifdef PERL_CORE -#define linklist Perl_linklist #define list Perl_list -#define listkids Perl_listkids #endif #define load_module Perl_load_module #define vload_module Perl_vload_module @@ -458,7 +474,6 @@ #define magic_set_all_env Perl_magic_set_all_env #define magic_sizepack Perl_magic_sizepack #define magic_wipepack Perl_magic_wipepack -#define magicname Perl_magicname #endif #define markstack_grow Perl_markstack_grow #if defined(USE_LOCALE_COLLATE) @@ -494,9 +509,6 @@ #define mode_from_discipline Perl_mode_from_discipline #endif #define moreswitches Perl_moreswitches -#ifdef PERL_CORE -#define my Perl_my -#endif #define my_atof Perl_my_atof #if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY)) #define my_bcopy Perl_my_bcopy @@ -633,7 +645,13 @@ #define pad_sv Perl_pad_sv #ifdef PERL_CORE #define pad_free Perl_pad_free -#define pad_reset Perl_pad_reset +#endif +#if defined(PERL_IN_PAD_C) +#ifdef PERL_CORE +#define pad_reset S_pad_reset +#endif +#endif +#ifdef PERL_CORE #define pad_swipe Perl_pad_swipe #define peep Perl_peep #endif @@ -668,23 +686,29 @@ #define require_pv Perl_require_pv #define pack_cat Perl_pack_cat #define packlist Perl_packlist -#ifdef PERL_USES_PL_PIDSTATUS +#if defined(PERL_USES_PL_PIDSTATUS) && defined(PERL_IN_UTIL_C) #ifdef PERL_CORE -#define pidgone Perl_pidgone +#define pidgone S_pidgone #endif #endif #define pmflag Perl_pmflag #ifdef PERL_CORE #define pmruntime Perl_pmruntime -#define pmtrans Perl_pmtrans +#endif +#if defined(PERL_IN_OP_C) +#ifdef PERL_CORE +#define pmtrans S_pmtrans +#endif #endif #define pop_scope Perl_pop_scope #ifdef PERL_CORE #define prepend_elem Perl_prepend_elem #endif #define push_scope Perl_push_scope +#if defined(PERL_IN_OP_C) #ifdef PERL_CORE -#define refkids Perl_refkids +#define refkids S_refkids +#endif #endif #define regdump Perl_regdump #define regdump Perl_regdump @@ -770,7 +794,7 @@ #define save_shared_pvref Perl_save_shared_pvref #define save_gp Perl_save_gp #define save_hash Perl_save_hash -#define save_helem Perl_save_helem +#define save_helem_flags Perl_save_helem_flags #define save_hptr Perl_save_hptr #define save_I16 Perl_save_I16 #define save_I32 Perl_save_I32 @@ -795,8 +819,14 @@ #ifdef PERL_CORE #define sawparens Perl_sawparens #define scalar Perl_scalar -#define scalarkids Perl_scalarkids -#define scalarseq Perl_scalarseq +#endif +#if defined(PERL_IN_OP_C) +#ifdef PERL_CORE +#define scalarkids S_scalarkids +#define scalarseq S_scalarseq +#endif +#endif +#ifdef PERL_CORE #define scalarvoid Perl_scalarvoid #endif #define scan_bin Perl_scan_bin @@ -812,9 +842,7 @@ #define setenv_getix Perl_setenv_getix #endif #endif -#if defined(PERL_CORE) || defined(PERL_EXT) #define setdefout Perl_setdefout -#endif #define share_hek Perl_share_hek #if defined(HAS_SIGACTION) && defined(SA_SIGINFO) #ifdef PERL_CORE @@ -2432,7 +2460,6 @@ #if defined(PERL_IMPLICIT_CONTEXT) #endif #ifdef PERL_CORE -#define cv_ckproto(a,b,c) Perl_cv_ckproto(aTHX_ a,b,c) #define cv_ckproto_len(a,b,c,d) Perl_cv_ckproto_len(aTHX_ a,b,c,d) #define cv_clone(a) Perl_cv_clone(aTHX_ a) #endif @@ -2467,8 +2494,12 @@ #define deprecate(a) Perl_deprecate(aTHX_ a) #define deprecate_old(a) Perl_deprecate_old(aTHX_ a) #endif +#if defined(PERL_IN_UTIL_C) +#ifdef PERL_CORE +#define vdie(a,b) S_vdie(aTHX_ a,b) +#endif +#endif #ifdef PERL_CORE -#define vdie(a,b) Perl_vdie(aTHX_ a,b) #define die_where(a,b) Perl_die_where(aTHX_ a,b) #endif #define dounwind(a) Perl_dounwind(aTHX_ a) @@ -2557,13 +2588,19 @@ #define fbm_instr(a,b,c,d) Perl_fbm_instr(aTHX_ a,b,c,d) #ifdef PERL_CORE #define find_script(a,b,c,d) Perl_find_script(aTHX_ a,b,c,d) -#define force_list(a) Perl_force_list(aTHX_ a) -#define fold_constants(a) Perl_fold_constants(aTHX_ a) +#endif +#if defined(PERL_IN_OP_C) +#ifdef PERL_CORE +#define force_list(a) S_force_list(aTHX_ a) +#define fold_constants(a) S_fold_constants(aTHX_ a) +#endif #endif #define vform(a,b) Perl_vform(aTHX_ a,b) #define free_tmps() Perl_free_tmps(aTHX) +#if defined(PERL_IN_OP_C) #ifdef PERL_CORE -#define gen_constant_list(a) Perl_gen_constant_list(aTHX_ a) +#define gen_constant_list(a) S_gen_constant_list(aTHX_ a) +#endif #endif #if !defined(HAS_GETENV_LEN) #ifdef PERL_CORE @@ -2626,8 +2663,12 @@ #define ibcmp(a,b,c) Perl_ibcmp(aTHX_ a,b,c) #define ibcmp_locale(a,b,c) Perl_ibcmp_locale(aTHX_ a,b,c) #define ibcmp_utf8(a,b,c,d,e,f,g,h) Perl_ibcmp_utf8(aTHX_ a,b,c,d,e,f,g,h) +#if defined(PERL_IN_DOIO_C) +#ifdef PERL_CORE +#define ingroup(a,b) S_ingroup(aTHX_ a,b) +#endif +#endif #ifdef PERL_CORE -#define ingroup(a,b) Perl_ingroup(aTHX_ a,b) #define init_argv_symbols(a,b) Perl_init_argv_symbols(aTHX_ a,b) #define init_debugger() Perl_init_debugger(aTHX) #endif @@ -2640,7 +2681,6 @@ #ifdef PERL_CORE #define io_close(a,b) Perl_io_close(aTHX_ a,b) #define invert(a) Perl_invert(aTHX_ a) -#define is_gv_magical(a,b,c) Perl_is_gv_magical(aTHX_ a,b,c) #endif #define is_lvalue_sub() Perl_is_lvalue_sub(aTHX) #define to_uni_upper_lc(a) Perl_to_uni_upper_lc(aTHX_ a) @@ -2714,10 +2754,14 @@ #endif #define op_refcnt_lock() Perl_op_refcnt_lock(aTHX) #define op_refcnt_unlock() Perl_op_refcnt_unlock(aTHX) +#if defined(PERL_IN_OP_C) +#ifdef PERL_CORE +#define linklist(a) S_linklist(aTHX_ a) +#define listkids(a) S_listkids(aTHX_ a) +#endif +#endif #ifdef PERL_CORE -#define linklist(a) Perl_linklist(aTHX_ a) #define list(a) Perl_list(aTHX_ a) -#define listkids(a) Perl_listkids(aTHX_ a) #endif #define vload_module(a,b,c,d) Perl_vload_module(aTHX_ a,b,c,d) #ifdef PERL_CORE @@ -2777,7 +2821,6 @@ #define magic_set_all_env(a,b) Perl_magic_set_all_env(aTHX_ a,b) #define magic_sizepack(a,b) Perl_magic_sizepack(aTHX_ a,b) #define magic_wipepack(a,b) Perl_magic_wipepack(aTHX_ a,b) -#define magicname(a,b,c) Perl_magicname(aTHX_ a,b,c) #endif #define markstack_grow() Perl_markstack_grow(aTHX) #if defined(USE_LOCALE_COLLATE) @@ -2795,7 +2838,7 @@ #define mg_clear(a) Perl_mg_clear(aTHX_ a) #define mg_copy(a,b,c,d) Perl_mg_copy(aTHX_ a,b,c,d) #ifdef PERL_CORE -#define mg_localize(a,b) Perl_mg_localize(aTHX_ a,b) +#define mg_localize(a,b,c) Perl_mg_localize(aTHX_ a,b,c) #endif #define mg_find(a,b) Perl_mg_find(aTHX_ a,b) #define mg_free(a) Perl_mg_free(aTHX_ a) @@ -2812,9 +2855,6 @@ #define mode_from_discipline(a,b) Perl_mode_from_discipline(aTHX_ a,b) #endif #define moreswitches(a) Perl_moreswitches(aTHX_ a) -#ifdef PERL_CORE -#define my(a) Perl_my(aTHX_ a) -#endif #define my_atof(a) Perl_my_atof(aTHX_ a) #if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY)) #define my_bcopy Perl_my_bcopy @@ -2950,7 +2990,13 @@ #define pad_sv(a) Perl_pad_sv(aTHX_ a) #ifdef PERL_CORE #define pad_free(a) Perl_pad_free(aTHX_ a) -#define pad_reset() Perl_pad_reset(aTHX) +#endif +#if defined(PERL_IN_PAD_C) +#ifdef PERL_CORE +#define pad_reset() S_pad_reset(aTHX) +#endif +#endif +#ifdef PERL_CORE #define pad_swipe(a,b) Perl_pad_swipe(aTHX_ a,b) #define peep(a) Perl_peep(aTHX_ a) #endif @@ -2984,23 +3030,29 @@ #define require_pv(a) Perl_require_pv(aTHX_ a) #define pack_cat(a,b,c,d,e,f,g) Perl_pack_cat(aTHX_ a,b,c,d,e,f,g) #define packlist(a,b,c,d,e) Perl_packlist(aTHX_ a,b,c,d,e) -#ifdef PERL_USES_PL_PIDSTATUS +#if defined(PERL_USES_PL_PIDSTATUS) && defined(PERL_IN_UTIL_C) #ifdef PERL_CORE -#define pidgone(a,b) Perl_pidgone(aTHX_ a,b) +#define pidgone(a,b) S_pidgone(aTHX_ a,b) #endif #endif #define pmflag(a,b) Perl_pmflag(aTHX_ a,b) #ifdef PERL_CORE #define pmruntime(a,b,c) Perl_pmruntime(aTHX_ a,b,c) -#define pmtrans(a,b,c) Perl_pmtrans(aTHX_ a,b,c) +#endif +#if defined(PERL_IN_OP_C) +#ifdef PERL_CORE +#define pmtrans(a,b,c) S_pmtrans(aTHX_ a,b,c) +#endif #endif #define pop_scope() Perl_pop_scope(aTHX) #ifdef PERL_CORE #define prepend_elem(a,b,c) Perl_prepend_elem(aTHX_ a,b,c) #endif #define push_scope() Perl_push_scope(aTHX) +#if defined(PERL_IN_OP_C) #ifdef PERL_CORE -#define refkids(a,b) Perl_refkids(aTHX_ a,b) +#define refkids(a,b) S_refkids(aTHX_ a,b) +#endif #endif #define regdump(a) Perl_regdump(aTHX_ a) #define regdump(a) Perl_regdump(aTHX_ a) @@ -3086,7 +3138,7 @@ #define save_shared_pvref(a) Perl_save_shared_pvref(aTHX_ a) #define save_gp(a,b) Perl_save_gp(aTHX_ a,b) #define save_hash(a) Perl_save_hash(aTHX_ a) -#define save_helem(a,b,c) Perl_save_helem(aTHX_ a,b,c) +#define save_helem_flags(a,b,c,d) Perl_save_helem_flags(aTHX_ a,b,c,d) #define save_hptr(a) Perl_save_hptr(aTHX_ a) #define save_I16(a) Perl_save_I16(aTHX_ a) #define save_I32(a) Perl_save_I32(aTHX_ a) @@ -3111,8 +3163,14 @@ #ifdef PERL_CORE #define sawparens(a) Perl_sawparens(aTHX_ a) #define scalar(a) Perl_scalar(aTHX_ a) -#define scalarkids(a) Perl_scalarkids(aTHX_ a) -#define scalarseq(a) Perl_scalarseq(aTHX_ a) +#endif +#if defined(PERL_IN_OP_C) +#ifdef PERL_CORE +#define scalarkids(a) S_scalarkids(aTHX_ a) +#define scalarseq(a) S_scalarseq(aTHX_ a) +#endif +#endif +#ifdef PERL_CORE #define scalarvoid(a) Perl_scalarvoid(aTHX_ a) #endif #define scan_bin(a,b,c) Perl_scan_bin(aTHX_ a,b,c) @@ -3128,9 +3186,7 @@ #define setenv_getix(a) Perl_setenv_getix(aTHX_ a) #endif #endif -#if defined(PERL_CORE) || defined(PERL_EXT) #define setdefout(a) Perl_setdefout(aTHX_ a) -#endif #define share_hek(a,b,c) Perl_share_hek(aTHX_ a,b,c) #if defined(HAS_SIGACTION) && defined(SA_SIGINFO) #ifdef PERL_CORE @@ -3790,7 +3846,7 @@ #endif #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE -#define save_scalar_at(a) S_save_scalar_at(aTHX_ a) +#define save_scalar_at(a,b) S_save_scalar_at(aTHX_ a,b) #endif #endif #if defined(PERL_IN_GV_C) || defined(PERL_IN_SV_C) || defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT)