X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=objXSUB.h;h=d57bb103f7a27bd48abe0eb2d180c3e67ff604ad;hb=7599c0b3a5551e3249bec4cfca2a97eefbcd917f;hp=c90b984262df22f3abda229635d54a1ed6aa307f;hpb=350de78d9c02710bb008e9ca922c78ba251ec366;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/objXSUB.h b/objXSUB.h
index c90b984..d57bb10 100644
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -34,6 +34,10 @@
 #define PL_LIO			(*Perl_ILIO_ptr(aTHXo))
 #undef  PL_Mem
 #define PL_Mem			(*Perl_IMem_ptr(aTHXo))
+#undef  PL_MemParse
+#define PL_MemParse		(*Perl_IMemParse_ptr(aTHXo))
+#undef  PL_MemShared
+#define PL_MemShared		(*Perl_IMemShared_ptr(aTHXo))
 #undef  PL_Proc
 #define PL_Proc			(*Perl_IProc_ptr(aTHXo))
 #undef  PL_Sock
@@ -144,6 +148,8 @@
 #define PL_eval_start		(*Perl_Ieval_start_ptr(aTHXo))
 #undef  PL_evalseq
 #define PL_evalseq		(*Perl_Ievalseq_ptr(aTHXo))
+#undef  PL_exit_flags
+#define PL_exit_flags		(*Perl_Iexit_flags_ptr(aTHXo))
 #undef  PL_exitlist
 #define PL_exitlist		(*Perl_Iexitlist_ptr(aTHXo))
 #undef  PL_exitlistlen
@@ -224,8 +230,6 @@
 #define PL_lex_dojoin		(*Perl_Ilex_dojoin_ptr(aTHXo))
 #undef  PL_lex_expect
 #define PL_lex_expect		(*Perl_Ilex_expect_ptr(aTHXo))
-#undef  PL_lex_fakebrack
-#define PL_lex_fakebrack	(*Perl_Ilex_fakebrack_ptr(aTHXo))
 #undef  PL_lex_formbrack
 #define PL_lex_formbrack	(*Perl_Ilex_formbrack_ptr(aTHXo))
 #undef  PL_lex_inpat
@@ -366,6 +370,12 @@
 #define PL_preprocess		(*Perl_Ipreprocess_ptr(aTHXo))
 #undef  PL_profiledata
 #define PL_profiledata		(*Perl_Iprofiledata_ptr(aTHXo))
+#undef  PL_psig_name
+#define PL_psig_name		(*Perl_Ipsig_name_ptr(aTHXo))
+#undef  PL_psig_ptr
+#define PL_psig_ptr		(*Perl_Ipsig_ptr_ptr(aTHXo))
+#undef  PL_ptr_table
+#define PL_ptr_table		(*Perl_Iptr_table_ptr(aTHXo))
 #undef  PL_replgv
 #define PL_replgv		(*Perl_Ireplgv_ptr(aTHXo))
 #undef  PL_rsfp
@@ -418,8 +428,6 @@
 #define PL_sv_objcount		(*Perl_Isv_objcount_ptr(aTHXo))
 #undef  PL_sv_root
 #define PL_sv_root		(*Perl_Isv_root_ptr(aTHXo))
-#undef  PL_sv_table
-#define PL_sv_table		(*Perl_Isv_table_ptr(aTHXo))
 #undef  PL_sv_undef
 #define PL_sv_undef		(*Perl_Isv_undef_ptr(aTHXo))
 #undef  PL_sv_yes
@@ -809,7 +817,19 @@
 
 /* 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)
+#  endif
+#endif
+#if defined(MYMALLOC)
+#endif
+#if defined(PERL_OBJECT)
+#endif
 #if defined(PERL_OBJECT)
+#else
 #endif
 #undef  Perl_amagic_call
 #define Perl_amagic_call	pPerl->Perl_amagic_call
@@ -1983,12 +2003,6 @@
 #define Perl_magicname		pPerl->Perl_magicname
 #undef  magicname
 #define magicname		Perl_magicname
-#if defined(MYMALLOC)
-#undef  Perl_malloced_size
-#define Perl_malloced_size	pPerl->Perl_malloced_size
-#undef  malloced_size
-#define malloced_size		Perl_malloced_size
-#endif
 #undef  Perl_markstack_grow
 #define Perl_markstack_grow	pPerl->Perl_markstack_grow
 #undef  markstack_grow
@@ -2404,36 +2418,23 @@
 #undef  peep
 #define peep			Perl_peep
 #if defined(PERL_OBJECT)
-#undef  perl_construct
-#define perl_construct		pPerl->perl_construct
-#undef  perl_destruct
-#define perl_destruct		pPerl->perl_destruct
-#undef  perl_free
-#define perl_free		pPerl->perl_free
-#undef  perl_run
-#define perl_run		pPerl->perl_run
-#undef  perl_parse
-#define perl_parse		pPerl->perl_parse
-#else
-#undef  perl_alloc
-#define perl_alloc		pPerl->perl_alloc
-#undef  perl_construct
-#define perl_construct		pPerl->perl_construct
-#undef  perl_destruct
-#define perl_destruct		pPerl->perl_destruct
-#undef  perl_free
-#define perl_free		pPerl->perl_free
-#undef  perl_run
-#define perl_run		pPerl->perl_run
-#undef  perl_parse
-#define perl_parse		pPerl->perl_parse
+#undef  Perl_construct
+#define Perl_construct		pPerl->Perl_construct
+#undef  Perl_destruct
+#define Perl_destruct		pPerl->Perl_destruct
+#undef  Perl_free
+#define Perl_free		pPerl->Perl_free
+#undef  Perl_run
+#define Perl_run		pPerl->Perl_run
+#undef  Perl_parse
+#define Perl_parse		pPerl->Perl_parse
+#endif
 #if defined(USE_THREADS)
 #undef  Perl_new_struct_thread
 #define Perl_new_struct_thread	pPerl->Perl_new_struct_thread
 #undef  new_struct_thread
 #define new_struct_thread	Perl_new_struct_thread
 #endif
-#endif
 #undef  Perl_call_atexit
 #define Perl_call_atexit	pPerl->Perl_call_atexit
 #undef  call_atexit
@@ -2724,6 +2725,10 @@
 #define Perl_save_I32		pPerl->Perl_save_I32
 #undef  save_I32
 #define save_I32		Perl_save_I32
+#undef  Perl_save_I8
+#define Perl_save_I8		pPerl->Perl_save_I8
+#undef  save_I8
+#define save_I8			Perl_save_I8
 #undef  Perl_save_int
 #define Perl_save_int		pPerl->Perl_save_int
 #undef  save_int
@@ -2760,6 +2765,10 @@
 #define Perl_save_pptr		pPerl->Perl_save_pptr
 #undef  save_pptr
 #define save_pptr		Perl_save_pptr
+#undef  Perl_save_vptr
+#define Perl_save_vptr		pPerl->Perl_save_vptr
+#undef  save_vptr
+#define save_vptr		Perl_save_vptr
 #undef  Perl_save_re_context
 #define Perl_save_re_context	pPerl->Perl_save_re_context
 #undef  save_re_context
@@ -3252,6 +3261,10 @@
 #define Perl_wait4pid		pPerl->Perl_wait4pid
 #undef  wait4pid
 #define wait4pid		Perl_wait4pid
+#undef  Perl_report_uninit
+#define Perl_report_uninit	pPerl->Perl_report_uninit
+#undef  report_uninit
+#define report_uninit		Perl_report_uninit
 #undef  Perl_warn
 #define Perl_warn		pPerl->Perl_warn
 #undef  warn
@@ -3304,22 +3317,6 @@
 #define Perl_dump_mstats	pPerl->Perl_dump_mstats
 #undef  dump_mstats
 #define dump_mstats		Perl_dump_mstats
-#undef  Perl_malloc
-#define Perl_malloc		pPerl->Perl_malloc
-#undef  malloc
-#define malloc			Perl_malloc
-#undef  Perl_calloc
-#define Perl_calloc		pPerl->Perl_calloc
-#undef  calloc
-#define calloc			Perl_calloc
-#undef  Perl_realloc
-#define Perl_realloc		pPerl->Perl_realloc
-#undef  realloc
-#define realloc			Perl_realloc
-#undef  Perl_mfree
-#define Perl_mfree		pPerl->Perl_mfree
-#undef  mfree
-#define mfree			Perl_mfree
 #endif
 #undef  Perl_safesysmalloc
 #define Perl_safesysmalloc	pPerl->Perl_safesysmalloc
@@ -3534,6 +3531,22 @@
 #undef  boot_core_xsutils
 #define boot_core_xsutils	Perl_boot_core_xsutils
 #if defined(USE_ITHREADS)
+#undef  Perl_cx_dup
+#define Perl_cx_dup		pPerl->Perl_cx_dup
+#undef  cx_dup
+#define cx_dup			Perl_cx_dup
+#undef  Perl_si_dup
+#define Perl_si_dup		pPerl->Perl_si_dup
+#undef  si_dup
+#define si_dup			Perl_si_dup
+#undef  Perl_ss_dup
+#define Perl_ss_dup		pPerl->Perl_ss_dup
+#undef  ss_dup
+#define ss_dup			Perl_ss_dup
+#undef  Perl_any_dup
+#define Perl_any_dup		pPerl->Perl_any_dup
+#undef  any_dup
+#define any_dup			Perl_any_dup
 #undef  Perl_he_dup
 #define Perl_he_dup		pPerl->Perl_he_dup
 #undef  he_dup
@@ -3568,24 +3581,25 @@
 #undef  sys_intern_dup
 #define sys_intern_dup		Perl_sys_intern_dup
 #endif
-#undef  Perl_sv_table_new
-#define Perl_sv_table_new	pPerl->Perl_sv_table_new
-#undef  sv_table_new
-#define sv_table_new		Perl_sv_table_new
-#undef  Perl_sv_table_fetch
-#define Perl_sv_table_fetch	pPerl->Perl_sv_table_fetch
-#undef  sv_table_fetch
-#define sv_table_fetch		Perl_sv_table_fetch
-#undef  Perl_sv_table_store
-#define Perl_sv_table_store	pPerl->Perl_sv_table_store
-#undef  sv_table_store
-#define sv_table_store		Perl_sv_table_store
-#undef  Perl_sv_table_split
-#define Perl_sv_table_split	pPerl->Perl_sv_table_split
-#undef  sv_table_split
-#define sv_table_split		Perl_sv_table_split
+#undef  Perl_ptr_table_new
+#define Perl_ptr_table_new	pPerl->Perl_ptr_table_new
+#undef  ptr_table_new
+#define ptr_table_new		Perl_ptr_table_new
+#undef  Perl_ptr_table_fetch
+#define Perl_ptr_table_fetch	pPerl->Perl_ptr_table_fetch
+#undef  ptr_table_fetch
+#define ptr_table_fetch		Perl_ptr_table_fetch
+#undef  Perl_ptr_table_store
+#define Perl_ptr_table_store	pPerl->Perl_ptr_table_store
+#undef  ptr_table_store
+#define ptr_table_store		Perl_ptr_table_store
+#undef  Perl_ptr_table_split
+#define Perl_ptr_table_split	pPerl->Perl_ptr_table_split
+#undef  ptr_table_split
+#define ptr_table_split		Perl_ptr_table_split
 #endif
 #if defined(PERL_OBJECT)
+#else
 #endif
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 #endif
@@ -3644,6 +3658,8 @@
 #  if defined(LEAKTEST)
 #  endif
 #endif
+#if defined(PERL_OBJECT)
+#endif
 #undef  Perl_ck_anoncode
 #define Perl_ck_anoncode	pPerl->Perl_ck_anoncode
 #undef  ck_anoncode