X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=0a12dcda6b85781523b3318b9d993ffbdc73d84b;hb=27713a047c8e9e901eeddf0155f554c629a9f4a4;hp=42013a1a8b0b2780080329bddbccc3955c6bb5d3;hpb=8f68c6c6e0b25189bbc5e293c61696110d14cfda;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/embed.h b/embed.h
index 42013a1..0a12dcd 100644
--- a/embed.h
+++ b/embed.h
@@ -671,7 +671,7 @@
 #define sv_collxfrm		Perl_sv_collxfrm
 #endif
 #define sv_compile_2op		Perl_sv_compile_2op
-#define sv_getcwd		Perl_sv_getcwd
+#define getcwd_sv		Perl_getcwd_sv
 #define sv_dec			Perl_sv_dec
 #define sv_dump			Perl_sv_dump
 #define sv_derived_from		Perl_sv_derived_from
@@ -1125,6 +1125,7 @@
 #define force_version		S_force_version
 #define force_word		S_force_word
 #define tokeq			S_tokeq
+#define pending_ident		S_pending_ident
 #define scan_const		S_scan_const
 #define scan_formline		S_scan_formline
 #define scan_heredoc		S_scan_heredoc
@@ -1176,6 +1177,7 @@
 #define stdize_locale		S_stdize_locale
 #endif
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#define closest_cop		S_closest_cop
 #define mess_alloc		S_mess_alloc
 #  if defined(LEAKTEST)
 #define xstat			S_xstat
@@ -2178,7 +2180,7 @@
 #define sv_collxfrm(a,b)	Perl_sv_collxfrm(aTHX_ a,b)
 #endif
 #define sv_compile_2op(a,b,c,d)	Perl_sv_compile_2op(aTHX_ a,b,c,d)
-#define sv_getcwd(a)		Perl_sv_getcwd(aTHX_ a)
+#define getcwd_sv(a)		Perl_getcwd_sv(aTHX_ a)
 #define sv_dec(a)		Perl_sv_dec(aTHX_ a)
 #define sv_dump(a)		Perl_sv_dump(aTHX_ a)
 #define sv_derived_from(a,b)	Perl_sv_derived_from(aTHX_ a,b)
@@ -2624,6 +2626,7 @@
 #define force_version(a)	S_force_version(aTHX_ a)
 #define force_word(a,b,c,d,e)	S_force_word(aTHX_ a,b,c,d,e)
 #define tokeq(a)		S_tokeq(aTHX_ a)
+#define pending_ident()		S_pending_ident(aTHX)
 #define scan_const(a)		S_scan_const(aTHX_ a)
 #define scan_formline(a)	S_scan_formline(aTHX_ a)
 #define scan_heredoc(a)		S_scan_heredoc(aTHX_ a)
@@ -2675,6 +2678,7 @@
 #define stdize_locale(a)	S_stdize_locale(aTHX_ a)
 #endif
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#define closest_cop(a,b)	S_closest_cop(aTHX_ a,b)
 #define mess_alloc()		S_mess_alloc(aTHX)
 #  if defined(LEAKTEST)
 #define xstat(a)		S_xstat(aTHX_ a)
@@ -3084,11 +3088,11 @@
 #  if defined(PERL_IMPLICIT_SYS)
 #  endif
 #endif
-#if defined(MYMALLOC)
 #define malloc			Perl_malloc
 #define calloc			Perl_calloc
 #define realloc			Perl_realloc
 #define mfree			Perl_mfree
+#if defined(MYMALLOC)
 #define malloced_size		Perl_malloced_size
 #endif
 #define get_context		Perl_get_context
@@ -4279,8 +4283,8 @@
 #endif
 #define Perl_sv_compile_2op	CPerlObj::Perl_sv_compile_2op
 #define sv_compile_2op		Perl_sv_compile_2op
-#define Perl_sv_getcwd		CPerlObj::Perl_sv_getcwd
-#define sv_getcwd		Perl_sv_getcwd
+#define Perl_getcwd_sv		CPerlObj::Perl_getcwd_sv
+#define getcwd_sv		Perl_getcwd_sv
 #define Perl_sv_dec		CPerlObj::Perl_sv_dec
 #define sv_dec			Perl_sv_dec
 #define Perl_sv_dump		CPerlObj::Perl_sv_dump
@@ -5109,6 +5113,8 @@
 #define force_word		S_force_word
 #define S_tokeq			CPerlObj::S_tokeq
 #define tokeq			S_tokeq
+#define S_pending_ident		CPerlObj::S_pending_ident
+#define pending_ident		S_pending_ident
 #define S_scan_const		CPerlObj::S_scan_const
 #define scan_const		S_scan_const
 #define S_scan_formline		CPerlObj::S_scan_formline
@@ -5197,6 +5203,8 @@
 #define stdize_locale		S_stdize_locale
 #endif
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#define S_closest_cop		CPerlObj::S_closest_cop
+#define closest_cop		S_closest_cop
 #define S_mess_alloc		CPerlObj::S_mess_alloc
 #define mess_alloc		S_mess_alloc
 #  if defined(LEAKTEST)