X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=3f3b668bbb618ac6956687c72165a362d28427e5;hb=0bcc34c2b0b0cb62c0df3d5e562b779fb96595ba;hp=aa85b16724ca296685ffdebfbc9c2acbcfa33f9c;hpb=d5b2b27b99d4ad8d4eeda4a420182b7cb89461aa;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/embed.h b/embed.h
index aa85b16..3f3b668 100644
--- 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
@@ -1397,6 +1411,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 +1654,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 +2168,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 +2886,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 +2904,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)
@@ -3327,7 +3361,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 +3403,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 +3646,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)