X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ObjXSub.h;h=6cb2baaf8e90c6223d8fee432566e77ba4524a39;hb=5f8e730b530d1a9f84c2333a1f2ca080d2fb3303;hp=93a0445aa5c0bfd03fb0b00a40a2553a9a128676;hpb=51aa15f38ed061e162eb5fdd50db6c15d839cf32;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ObjXSub.h b/ObjXSub.h
index 93a0445..6cb2baa 100644
--- a/ObjXSub.h
+++ b/ObjXSub.h
@@ -1,7 +1,6 @@
 #ifndef __ObjXSub_h__
 #define __ObjXSub_h__
 
-
 /* Varibles */ 
 #undef  Argv
 #define Argv			pPerl->Perl_Argv
@@ -41,6 +40,8 @@
 #define argvgv			pPerl->Perl_argvgv
 #undef  argvoutgv
 #define argvoutgv		pPerl->Perl_argvoutgv
+#undef  av_fetch_sv
+#define av_fetch_sv         pPerl->av_fetch_sv
 #undef  basetime
 #define basetime		pPerl->Perl_basetime
 #undef  beginav
@@ -177,6 +178,10 @@
 #define eval_start		pPerl->Perl_eval_start
 #undef  evalseq
 #define evalseq			pPerl->Perl_evalseq
+#undef  exitlist
+#define exitlist            pPerl->exitlist
+#undef  exitlistlen
+#define exitlistlen         pPerl->exitlistlen
 #undef  expect
 #define expect			pPerl->Perl_expect
 #undef  extralen
@@ -205,8 +210,14 @@
 #define he_root			pPerl->Perl_he_root
 #undef  hexdigit
 #define hexdigit		pPerl->Perl_hexdigit
+#undef  hintgv
+#define hintgv			pPerl->Perl_hintgv
 #undef  hints
 #define hints			pPerl->Perl_hints
+#undef  hv_fetch_ent_mh
+#define hv_fetch_ent_mh     pPerl->hv_fetch_ent_mh
+#undef  hv_fetch_sv
+#define hv_fetch_sv         pPerl->hv_fetch_sv
 #undef  in_clean_all
 #define in_clean_all		pPerl->Perl_in_clean_all
 #undef  in_clean_objs
@@ -225,6 +236,8 @@
 #define inplace			pPerl->Perl_inplace
 #undef  last_in_gv
 #define last_in_gv		pPerl->Perl_last_in_gv
+#undef  last_proto
+#define last_proto		pPerl->Perl_last_proto
 #undef  last_lop
 #define last_lop		pPerl->Perl_last_lop
 #undef  last_lop_op
@@ -331,6 +344,8 @@
 #define minus_p			pPerl->Perl_minus_p
 #undef  modcount
 #define modcount		pPerl->Perl_modcount
+#undef  modglobal
+#define modglobal       pPerl->Perl_modglobal
 #undef  multi_close
 #define multi_close		pPerl->Perl_multi_close
 #undef  multi_end
@@ -533,8 +548,6 @@
 #define screamfirst		pPerl->Perl_screamfirst
 #undef  screamnext
 #define screamnext		pPerl->Perl_screamnext
-#undef  scrgv
-#define scrgv			pPerl->Perl_scrgv
 #undef  secondgv
 #define secondgv		pPerl->Perl_secondgv
 #undef  seen_zerolen
@@ -605,6 +618,8 @@
 #define sv_undef		pPerl->Perl_sv_undef
 #undef  sv_yes
 #define sv_yes			pPerl->Perl_sv_yes
+#undef  svref_mutex
+#define svref_mutex         pPerl->svref_mutex
 #undef  sys_intern
 #define sys_intern		pPerl->Perl_sys_intern
 #undef  tainted
@@ -700,32 +715,16 @@
 #define av_undef            pPerl->Perl_av_undef
 #undef  av_unshift
 #define av_unshift          pPerl->Perl_av_unshift
-#undef  avhv_delete
-#define avhv_delete         pPerl->Perl_avhv_delete
-#undef  avhv_delete_ent
-#define avhv_delete_ent     pPerl->Perl_avhv_delete_ent
-#undef  avhv_exists
-#define avhv_exists         pPerl->Perl_avhv_exists
 #undef  avhv_exists_ent
 #define avhv_exists_ent     pPerl->Perl_avhv_exists_ent
-#undef  avhv_fetch
-#define avhv_fetch          pPerl->Perl_avhv_fetch
 #undef  avhv_fetch_ent
 #define avhv_fetch_ent      pPerl->Perl_avhv_fetch_ent
-#undef  avhv_iterinit
-#define avhv_iterinit       pPerl->Perl_avhv_iterinit
 #undef  avhv_iternext
 #define avhv_iternext       pPerl->Perl_avhv_iternext
-#undef  avhv_iternextsv
-#define avhv_iternextsv     pPerl->Perl_avhv_iternextsv
 #undef  avhv_iterval
 #define avhv_iterval        pPerl->Perl_avhv_iterval
 #undef  avhv_keys
 #define avhv_keys           pPerl->Perl_avhv_keys
-#undef  avhv_store
-#define avhv_store          pPerl->Perl_avhv_store
-#undef  avhv_store_ent
-#define avhv_store_ent      pPerl->Perl_avhv_store_ent
 #undef  bind_match
 #define bind_match          pPerl->Perl_bind_match
 #undef  block_end
@@ -1180,10 +1179,14 @@
 #define magic_setvec        pPerl->Perl_magic_setvec
 #undef  magic_sizepack
 #define magic_sizepack      pPerl->Perl_magic_sizepack
+#undef  magic_unchain
+#define magic_unchain       pPerl->Perl_magic_unchain
 #undef  magic_wipepack
 #define magic_wipepack      pPerl->Perl_magic_wipepack
 #undef  magicname
 #define magicname           pPerl->Perl_magicname
+#undef  malloced_size
+#define malloced_size       pPerl->Perl_malloced_size
 #undef  markstack_grow
 #define markstack_grow      pPerl->Perl_markstack_grow
 #undef  mem_collxfrm
@@ -1318,6 +1321,8 @@
 #define newHVREF            pPerl->Perl_newHVREF
 #undef  newHV
 #define newHV               pPerl->Perl_newHV
+#undef  newHVhv
+#define newHVhv             pPerl->Perl_newHVhv
 #undef  newIO
 #define newIO               pPerl->Perl_newIO
 #undef  newLISTOP
@@ -1559,6 +1564,8 @@
 #define save_hash           pPerl->Perl_save_hash
 #undef  save_helem
 #define save_helem          pPerl->Perl_save_helem
+#undef  save_hints
+#define save_hints          pPerl->Perl_save_hints
 #undef  save_hptr
 #define save_hptr           pPerl->Perl_save_hptr
 #undef  save_I16
@@ -2001,10 +2008,10 @@
 #define socketpair PerlSock_socketpair
 #endif  /* NO_XSLOCKS */
 
-#undef  THIS
-#define THIS pPerl
-#undef  THIS_
-#define THIS_ pPerl,
+#undef  PERL_OBJECT_THIS
+#define PERL_OBJECT_THIS pPerl
+#undef  PERL_OBJECT_THIS_
+#define PERL_OBJECT_THIS_ pPerl,
 
 #undef  SAVEDESTRUCTOR
 #define SAVEDESTRUCTOR(f,p) \