X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=objXSUB.h;h=3e0ccce4a934fa59d087d4f817ad4ed48f6a58ea;hb=2edbd6dac2bb2abcd4bc2c6669162b31938fd4fd;hp=c2385f8b62f4e5a67ca673ecf529b74ad3557952;hpb=14dd3ad8c9bf82cf09798a22cc89a9862dfd6d1a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/objXSUB.h b/objXSUB.h
index c2385f8..3e0ccce 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)
@@ -36,6 +35,10 @@
 #define Perl_Gv_AMupdate	pPerl->Perl_Gv_AMupdate
 #undef  Gv_AMupdate
 #define Gv_AMupdate		Perl_Gv_AMupdate
+#undef  Perl_apply_attrs_string
+#define Perl_apply_attrs_string	pPerl->Perl_apply_attrs_string
+#undef  apply_attrs_string
+#define apply_attrs_string	Perl_apply_attrs_string
 #undef  Perl_avhv_delete_ent
 #define Perl_avhv_delete_ent	pPerl->Perl_avhv_delete_ent
 #undef  avhv_delete_ent
@@ -48,6 +51,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
@@ -76,10 +83,6 @@
 #define Perl_av_extend		pPerl->Perl_av_extend
 #undef  av_extend
 #define av_extend		Perl_av_extend
-#undef  Perl_av_fake
-#define Perl_av_fake		pPerl->Perl_av_fake
-#undef  av_fake
-#define av_fake			Perl_av_fake
 #undef  Perl_av_fetch
 #define Perl_av_fetch		pPerl->Perl_av_fetch
 #undef  av_fetch
@@ -104,10 +107,6 @@
 #define Perl_av_push		pPerl->Perl_av_push
 #undef  av_push
 #define av_push			Perl_av_push
-#undef  Perl_av_reify
-#define Perl_av_reify		pPerl->Perl_av_reify
-#undef  av_reify
-#define av_reify		Perl_av_reify
 #undef  Perl_av_shift
 #define Perl_av_shift		pPerl->Perl_av_shift
 #undef  av_shift
@@ -185,6 +184,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 +225,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 +301,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
@@ -404,6 +423,10 @@
 #define Perl_gv_efullname3	pPerl->Perl_gv_efullname3
 #undef  gv_efullname3
 #define gv_efullname3		Perl_gv_efullname3
+#undef  Perl_gv_efullname4
+#define Perl_gv_efullname4	pPerl->Perl_gv_efullname4
+#undef  gv_efullname4
+#define gv_efullname4		Perl_gv_efullname4
 #undef  Perl_gv_fetchfile
 #define Perl_gv_fetchfile	pPerl->Perl_gv_fetchfile
 #undef  gv_fetchfile
@@ -432,6 +455,10 @@
 #define Perl_gv_fullname3	pPerl->Perl_gv_fullname3
 #undef  gv_fullname3
 #define gv_fullname3		Perl_gv_fullname3
+#undef  Perl_gv_fullname4
+#define Perl_gv_fullname4	pPerl->Perl_gv_fullname4
+#undef  gv_fullname4
+#define gv_fullname4		Perl_gv_fullname4
 #undef  Perl_gv_init
 #define Perl_gv_init		pPerl->Perl_gv_init
 #undef  gv_init
@@ -680,6 +707,14 @@
 #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_string
+#define Perl_is_utf8_string	pPerl->Perl_is_utf8_string
+#undef  is_utf8_string
+#define is_utf8_string		Perl_is_utf8_string
 #undef  Perl_is_utf8_alnum
 #define Perl_is_utf8_alnum	pPerl->Perl_is_utf8_alnum
 #undef  is_utf8_alnum
@@ -744,6 +779,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 +1085,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 +1291,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
@@ -1302,6 +1353,10 @@
 #define Perl_save_generic_svref	pPerl->Perl_save_generic_svref
 #undef  save_generic_svref
 #define save_generic_svref	Perl_save_generic_svref
+#undef  Perl_save_generic_pvref
+#define Perl_save_generic_pvref	pPerl->Perl_save_generic_pvref
+#undef  save_generic_pvref
+#define save_generic_pvref	Perl_save_generic_pvref
 #undef  Perl_save_gp
 #define Perl_save_gp		pPerl->Perl_save_gp
 #undef  save_gp
@@ -1738,6 +1793,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
@@ -1798,6 +1857,14 @@
 #define Perl_utf8_hop		pPerl->Perl_utf8_hop
 #undef  utf8_hop
 #define utf8_hop		Perl_utf8_hop
+#undef  Perl_utf8_to_bytes
+#define Perl_utf8_to_bytes	pPerl->Perl_utf8_to_bytes
+#undef  utf8_to_bytes
+#define utf8_to_bytes		Perl_utf8_to_bytes
+#undef  Perl_bytes_to_utf8
+#define Perl_bytes_to_utf8	pPerl->Perl_bytes_to_utf8
+#undef  bytes_to_utf8
+#define bytes_to_utf8		Perl_bytes_to_utf8
 #undef  Perl_utf8_to_uv
 #define Perl_utf8_to_uv		pPerl->Perl_utf8_to_uv
 #undef  utf8_to_uv
@@ -1822,6 +1889,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
@@ -1883,6 +1954,12 @@
 #define Perl_runops_debug	pPerl->Perl_runops_debug
 #undef  runops_debug
 #define runops_debug		Perl_runops_debug
+#if defined(USE_THREADS)
+#undef  Perl_sv_lock
+#define Perl_sv_lock		pPerl->Perl_sv_lock
+#undef  sv_lock
+#define sv_lock			Perl_sv_lock
+#endif
 #undef  Perl_sv_catpvf_mg
 #define Perl_sv_catpvf_mg	pPerl->Perl_sv_catpvf_mg
 #undef  sv_catpvf_mg
@@ -2133,6 +2210,16 @@
 #undef  ptr_table_split
 #define ptr_table_split		Perl_ptr_table_split
 #endif
+#if defined(HAVE_INTERP_INTERN)
+#undef  Perl_sys_intern_clear
+#define Perl_sys_intern_clear	pPerl->Perl_sys_intern_clear
+#undef  sys_intern_clear
+#define sys_intern_clear	Perl_sys_intern_clear
+#undef  Perl_sys_intern_init
+#define Perl_sys_intern_init	pPerl->Perl_sys_intern_init
+#undef  sys_intern_init
+#define sys_intern_init		Perl_sys_intern_init
+#endif
 #if defined(PERL_OBJECT)
 #else
 #endif
@@ -2183,6 +2270,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)