X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=09af299b1a3c8749fdd480cac37d59c756fb20b6;hb=4320d0941c269684ff8da26bfeab76ff0809b983;hp=2d432839be935f5647484fef82652f2409e65494;hpb=b3ab6785f6871a84567168e1bd0426ff2f66d282;p=p5sagit%2Fp5-mst-13.2.git diff --git a/embed.h b/embed.h index 2d43283..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. @@ -1113,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 @@ -1288,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 @@ -1299,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 +#ifndef SETUID_SCRIPTS_ARE_SECURE_NOW #endif -# if defined(IAMSUID) -#ifdef PERL_CORE -#define fd_on_nosuid_fs S_fd_on_nosuid_fs -#endif -# endif #ifdef PERL_CORE #define parse_body S_parse_body #define run_body S_run_body @@ -3454,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) @@ -3636,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,f) S_incpush(aTHX_ a,b,c,d,e,f) +#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) @@ -3648,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 -#ifdef PERL_CORE -#endif -# else +#ifndef SETUID_SCRIPTS_ARE_SECURE_NOW #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)