X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=objXSUB.h;h=8a0a81e5fd1cb3c4d23c8075a55f529d19e1d963;hb=9bc5fa8de0e98ff1317c3fdc7e35f6e13be0ac35;hp=1243e9e6683e31b20b143f6b77f323c9d37f5e72;hpb=827e134a90c4e2814fe47bdf310ed7e78fd7f61c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/objXSUB.h b/objXSUB.h
index 1243e9e..8a0a81e 100644
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -13,7 +13,6 @@
 /* XXX soon to be eliminated, only a few things in PERLCORE need these now */
 
 #if defined(PERL_IMPLICIT_SYS)
-#else
 #endif
 #if defined(USE_ITHREADS)
 #  if defined(PERL_IMPLICIT_SYS)
@@ -48,6 +47,10 @@
 #define Perl_avhv_fetch_ent	pPerl->Perl_avhv_fetch_ent
 #undef  avhv_fetch_ent
 #define avhv_fetch_ent		Perl_avhv_fetch_ent
+#undef  Perl_avhv_store_ent
+#define Perl_avhv_store_ent	pPerl->Perl_avhv_store_ent
+#undef  avhv_store_ent
+#define avhv_store_ent		Perl_avhv_store_ent
 #undef  Perl_avhv_iternext
 #define Perl_avhv_iternext	pPerl->Perl_avhv_iternext
 #undef  avhv_iternext
@@ -185,6 +188,10 @@
 #define Perl_form_nocontext	pPerl->Perl_form_nocontext
 #undef  form_nocontext
 #define form_nocontext		Perl_form_nocontext
+#undef  Perl_load_module_nocontext
+#define Perl_load_module_nocontext	pPerl->Perl_load_module_nocontext
+#undef  load_module_nocontext
+#define load_module_nocontext	Perl_load_module_nocontext
 #undef  Perl_mess_nocontext
 #define Perl_mess_nocontext	pPerl->Perl_mess_nocontext
 #undef  mess_nocontext
@@ -222,6 +229,14 @@
 #undef  fprintf_nocontext
 #define fprintf_nocontext	Perl_fprintf_nocontext
 #endif
+#undef  Perl_cv_const_sv
+#define Perl_cv_const_sv	pPerl->Perl_cv_const_sv
+#undef  cv_const_sv
+#define cv_const_sv		Perl_cv_const_sv
+#undef  Perl_cv_undef
+#define Perl_cv_undef		pPerl->Perl_cv_undef
+#undef  cv_undef
+#define cv_undef		Perl_cv_undef
 #undef  Perl_cx_dump
 #define Perl_cx_dump		pPerl->Perl_cx_dump
 #undef  cx_dump
@@ -290,10 +305,18 @@
 #define Perl_do_binmode		pPerl->Perl_do_binmode
 #undef  do_binmode
 #define do_binmode		Perl_do_binmode
+#undef  Perl_do_close
+#define Perl_do_close		pPerl->Perl_do_close
+#undef  do_close
+#define do_close		Perl_do_close
 #if !defined(WIN32)
 #endif
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
 #endif
+#undef  Perl_do_join
+#define Perl_do_join		pPerl->Perl_do_join
+#undef  do_join
+#define do_join			Perl_do_join
 #undef  Perl_do_open
 #define Perl_do_open		pPerl->Perl_do_open
 #undef  do_open
@@ -680,6 +703,10 @@
 #define Perl_to_uni_lower_lc	pPerl->Perl_to_uni_lower_lc
 #undef  to_uni_lower_lc
 #define to_uni_lower_lc		Perl_to_uni_lower_lc
+#undef  Perl_is_utf8_char
+#define Perl_is_utf8_char	pPerl->Perl_is_utf8_char
+#undef  is_utf8_char
+#define is_utf8_char		Perl_is_utf8_char
 #undef  Perl_is_utf8_alnum
 #define Perl_is_utf8_alnum	pPerl->Perl_is_utf8_alnum
 #undef  is_utf8_alnum
@@ -744,6 +771,14 @@
 #define Perl_leave_scope	pPerl->Perl_leave_scope
 #undef  leave_scope
 #define leave_scope		Perl_leave_scope
+#undef  Perl_load_module
+#define Perl_load_module	pPerl->Perl_load_module
+#undef  load_module
+#define load_module		Perl_load_module
+#undef  Perl_vload_module
+#define Perl_vload_module	pPerl->Perl_vload_module
+#undef  vload_module
+#define vload_module		Perl_vload_module
 #undef  Perl_looks_like_number
 #define Perl_looks_like_number	pPerl->Perl_looks_like_number
 #undef  looks_like_number
@@ -1042,6 +1077,10 @@
 #define Perl_newSViv		pPerl->Perl_newSViv
 #undef  newSViv
 #define newSViv			Perl_newSViv
+#undef  Perl_newSVuv
+#define Perl_newSVuv		pPerl->Perl_newSVuv
+#undef  newSVuv
+#define newSVuv			Perl_newSVuv
 #undef  Perl_newSVnv
 #define Perl_newSVnv		pPerl->Perl_newSVnv
 #undef  newSVnv
@@ -1244,6 +1283,10 @@
 #define Perl_rninstr		pPerl->Perl_rninstr
 #undef  rninstr
 #define rninstr			Perl_rninstr
+#undef  Perl_rsignal
+#define Perl_rsignal		pPerl->Perl_rsignal
+#undef  rsignal
+#define rsignal			Perl_rsignal
 #if !defined(HAS_RENAME)
 #endif
 #undef  Perl_savepv
@@ -1738,6 +1781,10 @@
 #define Perl_sv_vsetpvfn	pPerl->Perl_sv_vsetpvfn
 #undef  sv_vsetpvfn
 #define sv_vsetpvfn		Perl_sv_vsetpvfn
+#undef  Perl_str_to_version
+#define Perl_str_to_version	pPerl->Perl_str_to_version
+#undef  str_to_version
+#define str_to_version		Perl_str_to_version
 #undef  Perl_swash_init
 #define Perl_swash_init		pPerl->Perl_swash_init
 #undef  swash_init
@@ -1822,6 +1869,10 @@
 #define Perl_vwarner		pPerl->Perl_vwarner
 #undef  vwarner
 #define vwarner			Perl_vwarner
+#undef  Perl_whichsig
+#define Perl_whichsig		pPerl->Perl_whichsig
+#undef  whichsig
+#define whichsig		Perl_whichsig
 #if defined(USE_PURE_BISON)
 #else
 #endif
@@ -1987,6 +2038,7 @@
 #define Perl_magic_dump		pPerl->Perl_magic_dump
 #undef  magic_dump
 #define magic_dump		Perl_magic_dump
+#if defined(PERL_FLEXIBLE_EXCEPTIONS)
 #undef  Perl_default_protect
 #define Perl_default_protect	pPerl->Perl_default_protect
 #undef  default_protect
@@ -1995,6 +2047,7 @@
 #define Perl_vdefault_protect	pPerl->Perl_vdefault_protect
 #undef  vdefault_protect
 #define vdefault_protect	Perl_vdefault_protect
+#endif
 #undef  Perl_reginitcolors
 #define Perl_reginitcolors	pPerl->Perl_reginitcolors
 #undef  reginitcolors
@@ -2023,6 +2076,22 @@
 #define Perl_sv_pvbyte		pPerl->Perl_sv_pvbyte
 #undef  sv_pvbyte
 #define sv_pvbyte		Perl_sv_pvbyte
+#undef  Perl_sv_utf8_upgrade
+#define Perl_sv_utf8_upgrade	pPerl->Perl_sv_utf8_upgrade
+#undef  sv_utf8_upgrade
+#define sv_utf8_upgrade		Perl_sv_utf8_upgrade
+#undef  Perl_sv_utf8_downgrade
+#define Perl_sv_utf8_downgrade	pPerl->Perl_sv_utf8_downgrade
+#undef  sv_utf8_downgrade
+#define sv_utf8_downgrade	Perl_sv_utf8_downgrade
+#undef  Perl_sv_utf8_encode
+#define Perl_sv_utf8_encode	pPerl->Perl_sv_utf8_encode
+#undef  sv_utf8_encode
+#define sv_utf8_encode		Perl_sv_utf8_encode
+#undef  Perl_sv_utf8_decode
+#define Perl_sv_utf8_decode	pPerl->Perl_sv_utf8_decode
+#undef  sv_utf8_decode
+#define sv_utf8_decode		Perl_sv_utf8_decode
 #undef  Perl_sv_force_normal
 #define Perl_sv_force_normal	pPerl->Perl_sv_force_normal
 #undef  sv_force_normal
@@ -2135,12 +2204,16 @@
 #if defined(PERL_IN_PERL_C) || defined(PERL_DECL_PROT)
 #  if defined(IAMSUID)
 #  endif
+#if defined(PERL_FLEXIBLE_EXCEPTIONS)
+#endif
 #  if defined(USE_THREADS)
 #  endif
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)
 #endif
 #if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT)
+#if defined(PERL_FLEXIBLE_EXCEPTIONS)
+#endif
 #endif
 #if defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT)
 #endif
@@ -2161,6 +2234,8 @@
 #  endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
+#if 0
+#endif
 #  if defined(CRIPPLED_CC)
 #  endif
 #  if defined(PERL_CR_FILTER)