X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=09af299b1a3c8749fdd480cac37d59c756fb20b6;hb=4320d0941c269684ff8da26bfeab76ff0809b983;hp=886f26b945ccdd8f7b8942c474cc2d179b5fc1b6;hpb=3a9222bef66d8694e74574667f2e773ea7c3f1ed;p=p5sagit%2Fp5-mst-13.2.git diff --git a/embed.h b/embed.h index 886f26b..09af299 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, 2008, by Larry Wall and others + * 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 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. @@ -156,7 +156,7 @@ #define deprecate_old Perl_deprecate_old #endif #define die Perl_die -#if defined(PERL_IN_UTIL_C) +#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define vdie S_vdie #endif @@ -195,7 +195,7 @@ #ifdef PERL_CORE #define do_execfree Perl_do_execfree #endif -#ifdef PERL_IN_DOIO_C +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define exec_failed S_exec_failed #endif @@ -249,7 +249,7 @@ #ifdef PERL_CORE #define find_script Perl_find_script #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define force_list S_force_list #define fold_constants S_fold_constants @@ -258,7 +258,7 @@ #define form Perl_form #define vform Perl_vform #define free_tmps Perl_free_tmps -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define gen_constant_list S_gen_constant_list #endif @@ -312,7 +312,7 @@ #define ibcmp Perl_ibcmp #define ibcmp_locale Perl_ibcmp_locale #define ibcmp_utf8 Perl_ibcmp_utf8 -#if defined(PERL_IN_DOIO_C) +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define ingroup S_ingroup #endif @@ -403,7 +403,7 @@ #endif #define op_refcnt_lock Perl_op_refcnt_lock #define op_refcnt_unlock Perl_op_refcnt_unlock -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define linklist S_linklist #define listkids S_listkids @@ -640,7 +640,7 @@ #ifdef PERL_CORE #define pad_free Perl_pad_free #endif -#if defined(PERL_IN_PAD_C) +#if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define pad_reset S_pad_reset #endif @@ -689,7 +689,7 @@ #ifdef PERL_CORE #define pmruntime Perl_pmruntime #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define pmtrans S_pmtrans #endif @@ -699,7 +699,7 @@ #define prepend_elem Perl_prepend_elem #endif #define push_scope Perl_push_scope -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define refkids S_refkids #endif @@ -752,7 +752,7 @@ #define rsignal_save Perl_rsignal_save #endif #define rsignal_state Perl_rsignal_state -#if defined(PERL_IN_PP_CTL_C) +#if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define rxres_free S_rxres_free #define rxres_restore S_rxres_restore @@ -780,6 +780,7 @@ #define save_bool Perl_save_bool #define save_clearsv Perl_save_clearsv #define save_delete Perl_save_delete +#define save_adelete Perl_save_adelete #define save_destructor Perl_save_destructor #define save_destructor_x Perl_save_destructor_x #define save_generic_svref Perl_save_generic_svref @@ -822,7 +823,7 @@ #define sawparens Perl_sawparens #define scalar Perl_scalar #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define scalarkids S_scalarkids #define scalarseq S_scalarseq @@ -860,7 +861,7 @@ #define sv_2bool Perl_sv_2bool #define sv_2cv Perl_sv_2cv #define sv_2io Perl_sv_2io -#ifdef PERL_IN_SV_C +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define glob_2number S_glob_2number #define glob_2pv S_glob_2pv @@ -884,7 +885,7 @@ #define sv_pvutf8n Perl_sv_pvutf8n #define sv_pvbyten Perl_sv_pvbyten #define sv_true Perl_sv_true -#if defined (PERL_IN_SV_C) +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define sv_add_arena S_sv_add_arena #endif @@ -1112,7 +1113,6 @@ #endif #ifdef PERL_CORE #define my_attrs Perl_my_attrs -#define boot_core_xsutils Perl_boot_core_xsutils #endif #if defined(USE_ITHREADS) #define cx_dup Perl_cx_dup @@ -1287,6 +1287,7 @@ #define find_beginning S_find_beginning #define forbid_setid S_forbid_setid #define incpush S_incpush +#define incpush_use_sep S_incpush_use_sep #define init_interp S_init_interp #define init_ids S_init_ids #define init_main_stash S_init_main_stash @@ -1298,19 +1299,8 @@ #define open_script S_open_script #define usage S_usage #endif -#ifdef DOSUID -# ifdef IAMSUID -# else -# endif -#else -# ifndef SETUID_SCRIPTS_ARE_SECURE_NOW -# endif -#endif -# if defined(IAMSUID) -#ifdef PERL_CORE -#define fd_on_nosuid_fs S_fd_on_nosuid_fs +#ifndef SETUID_SCRIPTS_ARE_SECURE_NOW #endif -# endif #ifdef PERL_CORE #define parse_body S_parse_body #define run_body S_run_body @@ -1648,7 +1638,7 @@ #define sv_setsv_flags Perl_sv_setsv_flags #define sv_catpvn_flags Perl_sv_catpvn_flags #define sv_catsv_flags Perl_sv_catsv_flags -#define sv_utf8_upgrade_flags Perl_sv_utf8_upgrade_flags +#define sv_utf8_upgrade_flags_grow Perl_sv_utf8_upgrade_flags_grow #define sv_pvn_force_flags Perl_sv_pvn_force_flags #define sv_copypv Perl_sv_copypv #define my_atof2 Perl_my_atof2 @@ -1686,7 +1676,7 @@ #ifdef PERL_CORE #define deb_stack_all Perl_deb_stack_all #endif -#ifdef PERL_IN_DEB_C +#if defined(PERL_IN_DEB_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define deb_stack_n S_deb_stack_n #endif @@ -1956,9 +1946,6 @@ #endif #if !defined(HAS_SIGNBIT) #endif -#ifdef PERL_CORE -#define mro_meta_init Perl_mro_meta_init -#endif #if defined(USE_ITHREADS) #ifdef PERL_CORE #define mro_meta_dup Perl_mro_meta_dup @@ -1967,7 +1954,6 @@ #define mro_get_linear_isa Perl_mro_get_linear_isa #if defined(PERL_IN_MRO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE -#define mro_get_linear_isa_c3 S_mro_get_linear_isa_c3 #define mro_get_linear_isa_dfs S_mro_get_linear_isa_dfs #endif #endif @@ -2494,7 +2480,7 @@ #define deprecate(a) Perl_deprecate(aTHX_ a) #define deprecate_old(a) Perl_deprecate_old(aTHX_ a) #endif -#if defined(PERL_IN_UTIL_C) +#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define vdie(a,b) S_vdie(aTHX_ a,b) #endif @@ -2535,7 +2521,7 @@ #ifdef PERL_CORE #define do_execfree() Perl_do_execfree(aTHX) #endif -#ifdef PERL_IN_DOIO_C +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define exec_failed(a,b,c) S_exec_failed(aTHX_ a,b,c) #endif @@ -2589,7 +2575,7 @@ #ifdef PERL_CORE #define find_script(a,b,c,d) Perl_find_script(aTHX_ a,b,c,d) #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define force_list(a) S_force_list(aTHX_ a) #define fold_constants(a) S_fold_constants(aTHX_ a) @@ -2597,7 +2583,7 @@ #endif #define vform(a,b) Perl_vform(aTHX_ a,b) #define free_tmps() Perl_free_tmps(aTHX) -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define gen_constant_list(a) S_gen_constant_list(aTHX_ a) #endif @@ -2663,7 +2649,7 @@ #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) +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define ingroup(a,b) S_ingroup(aTHX_ a,b) #endif @@ -2754,7 +2740,7 @@ #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) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define linklist(a) S_linklist(aTHX_ a) #define listkids(a) S_listkids(aTHX_ a) @@ -2988,7 +2974,7 @@ #ifdef PERL_CORE #define pad_free(a) Perl_pad_free(aTHX_ a) #endif -#if defined(PERL_IN_PAD_C) +#if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define pad_reset() S_pad_reset(aTHX) #endif @@ -3036,7 +3022,7 @@ #ifdef PERL_CORE #define pmruntime(a,b,c) Perl_pmruntime(aTHX_ a,b,c) #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define pmtrans(a,b,c) S_pmtrans(aTHX_ a,b,c) #endif @@ -3046,7 +3032,7 @@ #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) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define refkids(a,b) S_refkids(aTHX_ a,b) #endif @@ -3099,7 +3085,7 @@ #define rsignal_save(a,b,c) Perl_rsignal_save(aTHX_ a,b,c) #endif #define rsignal_state(a) Perl_rsignal_state(aTHX_ a) -#if defined(PERL_IN_PP_CTL_C) +#if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define rxres_free(a) S_rxres_free(aTHX_ a) #define rxres_restore(a,b) S_rxres_restore(aTHX_ a,b) @@ -3127,6 +3113,7 @@ #define save_bool(a) Perl_save_bool(aTHX_ a) #define save_clearsv(a) Perl_save_clearsv(aTHX_ a) #define save_delete(a,b,c) Perl_save_delete(aTHX_ a,b,c) +#define save_adelete(a,b) Perl_save_adelete(aTHX_ a,b) #define save_destructor(a,b) Perl_save_destructor(aTHX_ a,b) #define save_destructor_x(a,b) Perl_save_destructor_x(aTHX_ a,b) #ifdef PERL_CORE @@ -3173,7 +3160,7 @@ #define sawparens(a) Perl_sawparens(aTHX_ a) #define scalar(a) Perl_scalar(aTHX_ a) #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define scalarkids(a) S_scalarkids(aTHX_ a) #define scalarseq(a) S_scalarseq(aTHX_ a) @@ -3211,7 +3198,7 @@ #define sv_2bool(a) Perl_sv_2bool(aTHX_ a) #define sv_2cv(a,b,c,d) Perl_sv_2cv(aTHX_ a,b,c,d) #define sv_2io(a) Perl_sv_2io(aTHX_ a) -#ifdef PERL_IN_SV_C +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define glob_2number(a) S_glob_2number(aTHX_ a) #define glob_2pv(a,b) S_glob_2pv(aTHX_ a,b) @@ -3235,7 +3222,7 @@ #define sv_pvutf8n(a,b) Perl_sv_pvutf8n(aTHX_ a,b) #define sv_pvbyten(a,b) Perl_sv_pvbyten(aTHX_ a,b) #define sv_true(a) Perl_sv_true(aTHX_ a) -#if defined (PERL_IN_SV_C) +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define sv_add_arena(a,b,c) S_sv_add_arena(aTHX_ a,b,c) #endif @@ -3456,7 +3443,6 @@ #endif #ifdef PERL_CORE #define my_attrs(a,b) Perl_my_attrs(aTHX_ a,b) -#define boot_core_xsutils() Perl_boot_core_xsutils(aTHX) #endif #if defined(USE_ITHREADS) #define cx_dup(a,b,c,d) Perl_cx_dup(aTHX_ a,b,c,d) @@ -3638,7 +3624,8 @@ #ifdef PERL_CORE #define find_beginning(a,b) S_find_beginning(aTHX_ a,b) #define forbid_setid(a,b) S_forbid_setid(aTHX_ a,b) -#define incpush(a,b,c,d,e) S_incpush(aTHX_ a,b,c,d,e) +#define incpush(a,b,c) S_incpush(aTHX_ a,b,c) +#define incpush_use_sep(a,b,c) S_incpush_use_sep(aTHX_ a,b,c) #define init_interp() S_init_interp(aTHX) #define init_ids() S_init_ids(aTHX) #define init_main_stash() S_init_main_stash(aTHX) @@ -3650,29 +3637,14 @@ #define open_script(a,b,c,d) S_open_script(aTHX_ a,b,c,d) #define usage(a) S_usage(aTHX_ a) #endif -#ifdef DOSUID -# ifdef IAMSUID +#ifndef SETUID_SCRIPTS_ARE_SECURE_NOW #ifdef PERL_CORE #endif -# else -#ifdef PERL_CORE -#endif -# endif -#else -# ifndef SETUID_SCRIPTS_ARE_SECURE_NOW -#ifdef PERL_CORE #endif -# endif -#endif -# if defined(IAMSUID) -#ifdef PERL_CORE -#define fd_on_nosuid_fs(a) S_fd_on_nosuid_fs(aTHX_ a) -#endif -# endif #ifdef PERL_CORE #define parse_body(a,b) S_parse_body(aTHX_ a,b) #define run_body(a) S_run_body(aTHX_ a) -#define incpush_if_exists(a) S_incpush_if_exists(aTHX_ a) +#define incpush_if_exists(a,b,c) S_incpush_if_exists(aTHX_ a,b,c) #endif #endif #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT) @@ -4009,7 +3981,7 @@ #define sv_setsv_flags(a,b,c) Perl_sv_setsv_flags(aTHX_ a,b,c) #define sv_catpvn_flags(a,b,c,d) Perl_sv_catpvn_flags(aTHX_ a,b,c,d) #define sv_catsv_flags(a,b,c) Perl_sv_catsv_flags(aTHX_ a,b,c) -#define sv_utf8_upgrade_flags(a,b) Perl_sv_utf8_upgrade_flags(aTHX_ a,b) +#define sv_utf8_upgrade_flags_grow(a,b,c) Perl_sv_utf8_upgrade_flags_grow(aTHX_ a,b,c) #define sv_pvn_force_flags(a,b,c) Perl_sv_pvn_force_flags(aTHX_ a,b,c) #define sv_copypv(a,b) Perl_sv_copypv(aTHX_ a,b) #define my_atof2(a,b) Perl_my_atof2(aTHX_ a,b) @@ -4047,7 +4019,7 @@ #ifdef PERL_CORE #define deb_stack_all() Perl_deb_stack_all(aTHX) #endif -#ifdef PERL_IN_DEB_C +#if defined(PERL_IN_DEB_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define deb_stack_n(a,b,c,d,e) S_deb_stack_n(aTHX_ a,b,c,d,e) #endif @@ -4324,7 +4296,6 @@ #if defined(PERL_CORE) || defined(PERL_EXT) #endif #ifdef PERL_CORE -#define mro_meta_init(a) Perl_mro_meta_init(aTHX_ a) #endif #if defined(USE_ITHREADS) #ifdef PERL_CORE @@ -4334,7 +4305,6 @@ #define mro_get_linear_isa(a) Perl_mro_get_linear_isa(aTHX_ a) #if defined(PERL_IN_MRO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE -#define mro_get_linear_isa_c3(a,b) S_mro_get_linear_isa_c3(aTHX_ a,b) #define mro_get_linear_isa_dfs(a,b) S_mro_get_linear_isa_dfs(aTHX_ a,b) #endif #endif