sv_clear can manipulate the arena array directly too.

[p5sagit/p5-mst-13.2.git] / embed.h

diff --git a/embed.h b/embed.h
index aa85b16..d534f17 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -165,6 +165,12 @@
 #ifdef PERL_CORE
 #define do_eof                 Perl_do_eof
 #endif
+#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION
+#else
+#ifdef PERL_CORE
+#define do_exec                        Perl_do_exec
+#endif
+#endif
 #if defined(WIN32) || defined(__SYMBIAN32__)
 #define do_aspawn              Perl_do_aspawn
 #define do_spawn               Perl_do_spawn
@@ -884,9 +890,15 @@
 #define bytes_to_utf8          Perl_bytes_to_utf8
 #define utf8_to_uvchr          Perl_utf8_to_uvchr
 #define utf8_to_uvuni          Perl_utf8_to_uvuni
+#ifdef EBCDIC
 #define utf8n_to_uvchr         Perl_utf8n_to_uvchr
+#else
+#endif
 #define utf8n_to_uvuni         Perl_utf8n_to_uvuni
+#ifdef EBCDIC
 #define uvchr_to_utf8          Perl_uvchr_to_utf8
+#else
+#endif
 #define uvchr_to_utf8_flags    Perl_uvchr_to_utf8_flags
 #define uvuni_to_utf8_flags    Perl_uvuni_to_utf8_flags
 #define pv_uni_display         Perl_pv_uni_display
@@ -896,7 +908,9 @@
 #define vivify_ref             Perl_vivify_ref
 #define wait4pid               Perl_wait4pid
 #define parse_unicode_opts     Perl_parse_unicode_opts
+#endif
 #define seed                   Perl_seed
+#ifdef PERL_CORE
 #define get_hash_seed          Perl_get_hash_seed
 #define report_evil_fh         Perl_report_evil_fh
 #define report_uninit          Perl_report_uninit
@@ -1193,6 +1207,19 @@
 #define method_common          S_method_common
 #endif
 #endif
+#if defined(PERL_IN_PP_SORT_C) || defined(PERL_DECL_PROT)
+#ifdef PERL_CORE
+#define sv_ncmp                        S_sv_ncmp
+#define sv_i_ncmp              S_sv_i_ncmp
+#define amagic_ncmp            S_amagic_ncmp
+#define amagic_i_ncmp          S_amagic_i_ncmp
+#define amagic_cmp             S_amagic_cmp
+#define amagic_cmp_locale      S_amagic_cmp_locale
+#define sortcv                 S_sortcv
+#define sortcv_xsub            S_sortcv_xsub
+#define sortcv_stacked         S_sortcv_stacked
+#endif
+#endif
 #if defined(PERL_IN_PP_SYS_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
 #define doform                 S_doform
@@ -1397,6 +1424,7 @@
 #if defined(PERL_IN_UTF8_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
 #define is_utf8_char_slow      S_is_utf8_char_slow
+#define is_utf8_common         S_is_utf8_common
 #endif
 #endif
 #define sv_setsv_flags         Perl_sv_setsv_flags
@@ -1639,6 +1667,9 @@
 #endif
 #ifndef SPRINTF_RETURNS_STRLEN
 #endif
+#ifdef PERL_CORE
+#define my_clearenv            Perl_my_clearenv
+#endif
 #define ck_anoncode            Perl_ck_anoncode
 #define ck_bitop               Perl_ck_bitop
 #define ck_concat              Perl_ck_concat
@@ -2150,6 +2181,14 @@
 #ifdef PERL_CORE
 #define do_eof(a)              Perl_do_eof(aTHX_ a)
 #endif
+#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION
+#ifdef PERL_CORE
+#endif
+#else
+#ifdef PERL_CORE
+#define do_exec(a)             Perl_do_exec(aTHX_ a)
+#endif
+#endif
 #if defined(WIN32) || defined(__SYMBIAN32__)
 #define do_aspawn(a,b,c)       Perl_do_aspawn(aTHX_ a,b,c)
 #define do_spawn(a)            Perl_do_spawn(aTHX_ a)
@@ -2860,9 +2899,15 @@
 #define bytes_to_utf8(a,b)     Perl_bytes_to_utf8(aTHX_ a,b)
 #define utf8_to_uvchr(a,b)     Perl_utf8_to_uvchr(aTHX_ a,b)
 #define utf8_to_uvuni(a,b)     Perl_utf8_to_uvuni(aTHX_ a,b)
+#ifdef EBCDIC
 #define utf8n_to_uvchr(a,b,c,d)        Perl_utf8n_to_uvchr(aTHX_ a,b,c,d)
+#else
+#endif
 #define utf8n_to_uvuni(a,b,c,d)        Perl_utf8n_to_uvuni(aTHX_ a,b,c,d)
+#ifdef EBCDIC
 #define uvchr_to_utf8(a,b)     Perl_uvchr_to_utf8(aTHX_ a,b)
+#else
+#endif
 #define uvchr_to_utf8_flags(a,b,c)     Perl_uvchr_to_utf8_flags(aTHX_ a,b,c)
 #define uvuni_to_utf8_flags(a,b,c)     Perl_uvuni_to_utf8_flags(aTHX_ a,b,c)
 #define pv_uni_display(a,b,c,d,e)      Perl_pv_uni_display(aTHX_ a,b,c,d,e)
@@ -2872,7 +2917,9 @@
 #define vivify_ref(a,b)                Perl_vivify_ref(aTHX_ a,b)
 #define wait4pid(a,b,c)                Perl_wait4pid(aTHX_ a,b,c)
 #define parse_unicode_opts(a)  Perl_parse_unicode_opts(aTHX_ a)
+#endif
 #define seed()                 Perl_seed(aTHX)
+#ifdef PERL_CORE
 #define get_hash_seed()                Perl_get_hash_seed(aTHX)
 #define report_evil_fh(a,b,c)  Perl_report_evil_fh(aTHX_ a,b,c)
 #define report_uninit(a)       Perl_report_uninit(aTHX_ a)
@@ -3164,6 +3211,19 @@
 #define method_common(a,b)     S_method_common(aTHX_ a,b)
 #endif
 #endif
+#if defined(PERL_IN_PP_SORT_C) || defined(PERL_DECL_PROT)
+#ifdef PERL_CORE
+#define sv_ncmp(a,b)           S_sv_ncmp(aTHX_ a,b)
+#define sv_i_ncmp(a,b)         S_sv_i_ncmp(aTHX_ a,b)
+#define amagic_ncmp(a,b)       S_amagic_ncmp(aTHX_ a,b)
+#define amagic_i_ncmp(a,b)     S_amagic_i_ncmp(aTHX_ a,b)
+#define amagic_cmp(a,b)                S_amagic_cmp(aTHX_ a,b)
+#define amagic_cmp_locale(a,b) S_amagic_cmp_locale(aTHX_ a,b)
+#define sortcv(a,b)            S_sortcv(aTHX_ a,b)
+#define sortcv_xsub(a,b)       S_sortcv_xsub(aTHX_ a,b)
+#define sortcv_stacked(a,b)    S_sortcv_stacked(aTHX_ a,b)
+#endif
+#endif
 #if defined(PERL_IN_PP_SYS_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
 #define doform(a,b,c)          S_doform(aTHX_ a,b,c)
@@ -3327,7 +3387,7 @@
 #endif
 #  if defined(DEBUGGING)
 #ifdef PERL_CORE
-#define tokereport(a,b)                S_tokereport(aTHX_ a,b)
+#define tokereport(a)          S_tokereport(aTHX_ a)
 #endif
 #  endif
 #ifdef PERL_CORE
@@ -3369,6 +3429,7 @@
 #if defined(PERL_IN_UTF8_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
 #define is_utf8_char_slow(a,b) S_is_utf8_char_slow(aTHX_ a,b)
+#define is_utf8_common(a,b,c)  S_is_utf8_common(aTHX_ a,b,c)
 #endif
 #endif
 #define sv_setsv_flags(a,b,c)  Perl_sv_setsv_flags(aTHX_ a,b,c)
@@ -3611,6 +3672,9 @@
 #endif
 #ifndef SPRINTF_RETURNS_STRLEN
 #endif
+#ifdef PERL_CORE
+#define my_clearenv()          Perl_my_clearenv(aTHX)
+#endif
 #define ck_anoncode(a)         Perl_ck_anoncode(aTHX_ a)
 #define ck_bitop(a)            Perl_ck_bitop(aTHX_ a)
 #define ck_concat(a)           Perl_ck_concat(aTHX_ a)