delete thrdvar.h and move its contents to intrpvar.h

p4raw-id: //depot/perl@31245

1 files changed, 157 insertions, 159 deletions

diff --git a/perlapi.h b/perlapi.h
index 9888ed7c0c..9ac642f9a6 100644
--- a/perlapi.h
+++ b/perlapi.h
@@ -10,7 +10,7 @@
  *
  * !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
  * This file is built by embed.pl from data in embed.fnc, embed.pl,
- * pp.sym, intrpvar.h, perlvars.h and thrdvar.h.
+ * pp.sym, intrpvar.h, and perlvars.h.
  * Any changes made here will be lost!
  *
  * Edit those files and run 'make regen_headers' to effect changes.
@@ -37,7 +37,6 @@ START_EXTERN_C
 #define PERLVARISC(v,i)	typedef const char PL_##v##_t[sizeof(i)];	\
 			EXTERN_C PL_##v##_t* Perl_##v##_ptr(pTHX);
 
-#include "thrdvar.h"
 #include "intrpvar.h"
 #include "perlvars.h"
 
@@ -96,7 +95,6 @@ EXTCONST void * const PL_force_link_funcs[] = {
 #pragma message disable (nonstandcast)
 #endif
 
-#include "thrdvar.h"
 #include "intrpvar.h"
 #include "perlvars.h"
 
@@ -162,6 +160,10 @@ END_EXTERN_C
 #define PL_Sock			(*Perl_ISock_ptr(aTHX))
 #undef  PL_StdIO
 #define PL_StdIO		(*Perl_IStdIO_ptr(aTHX))
+#undef  PL_Sv
+#define PL_Sv			(*Perl_ISv_ptr(aTHX))
+#undef  PL_Xpv
+#define PL_Xpv			(*Perl_IXpv_ptr(aTHX))
 #undef  PL_amagic_generation
 #define PL_amagic_generation	(*Perl_Iamagic_generation_ptr(aTHX))
 #undef  PL_an
@@ -172,6 +174,8 @@ END_EXTERN_C
 #define PL_argvout_stack	(*Perl_Iargvout_stack_ptr(aTHX))
 #undef  PL_argvoutgv
 #define PL_argvoutgv		(*Perl_Iargvoutgv_ptr(aTHX))
+#undef  PL_av_fetch_sv
+#define PL_av_fetch_sv		(*Perl_Iav_fetch_sv_ptr(aTHX))
 #undef  PL_basetime
 #define PL_basetime		(*Perl_Ibasetime_ptr(aTHX))
 #undef  PL_beginav
@@ -184,10 +188,14 @@ END_EXTERN_C
 #define PL_body_arenas		(*Perl_Ibody_arenas_ptr(aTHX))
 #undef  PL_body_roots
 #define PL_body_roots		(*Perl_Ibody_roots_ptr(aTHX))
+#undef  PL_bodytarget
+#define PL_bodytarget		(*Perl_Ibodytarget_ptr(aTHX))
 #undef  PL_checkav
 #define PL_checkav		(*Perl_Icheckav_ptr(aTHX))
 #undef  PL_checkav_save
 #define PL_checkav_save		(*Perl_Icheckav_save_ptr(aTHX))
+#undef  PL_chopset
+#define PL_chopset		(*Perl_Ichopset_ptr(aTHX))
 #undef  PL_clocktick
 #define PL_clocktick		(*Perl_Iclocktick_ptr(aTHX))
 #undef  PL_collation_ix
@@ -200,6 +208,10 @@ END_EXTERN_C
 #define PL_collxfrm_base	(*Perl_Icollxfrm_base_ptr(aTHX))
 #undef  PL_collxfrm_mult
 #define PL_collxfrm_mult	(*Perl_Icollxfrm_mult_ptr(aTHX))
+#undef  PL_colors
+#define PL_colors		(*Perl_Icolors_ptr(aTHX))
+#undef  PL_colorset
+#define PL_colorset		(*Perl_Icolorset_ptr(aTHX))
 #undef  PL_compcv
 #define PL_compcv		(*Perl_Icompcv_ptr(aTHX))
 #undef  PL_compiling
@@ -220,8 +232,20 @@ END_EXTERN_C
 #define PL_cshlen		(*Perl_Icshlen_ptr(aTHX))
 #undef  PL_cshname
 #define PL_cshname		(*Perl_Icshname_ptr(aTHX))
+#undef  PL_curcop
+#define PL_curcop		(*Perl_Icurcop_ptr(aTHX))
 #undef  PL_curcopdb
 #define PL_curcopdb		(*Perl_Icurcopdb_ptr(aTHX))
+#undef  PL_curpad
+#define PL_curpad		(*Perl_Icurpad_ptr(aTHX))
+#undef  PL_curpm
+#define PL_curpm		(*Perl_Icurpm_ptr(aTHX))
+#undef  PL_curstack
+#define PL_curstack		(*Perl_Icurstack_ptr(aTHX))
+#undef  PL_curstackinfo
+#define PL_curstackinfo		(*Perl_Icurstackinfo_ptr(aTHX))
+#undef  PL_curstash
+#define PL_curstash		(*Perl_Icurstash_ptr(aTHX))
 #undef  PL_curstname
 #define PL_curstname		(*Perl_Icurstname_ptr(aTHX))
 #undef  PL_custom_op_descs
@@ -242,8 +266,18 @@ END_EXTERN_C
 #define PL_def_layerlist	(*Perl_Idef_layerlist_ptr(aTHX))
 #undef  PL_defgv
 #define PL_defgv		(*Perl_Idefgv_ptr(aTHX))
+#undef  PL_defoutgv
+#define PL_defoutgv		(*Perl_Idefoutgv_ptr(aTHX))
+#undef  PL_defstash
+#define PL_defstash		(*Perl_Idefstash_ptr(aTHX))
+#undef  PL_delayedisa
+#define PL_delayedisa		(*Perl_Idelayedisa_ptr(aTHX))
+#undef  PL_delaymagic
+#define PL_delaymagic		(*Perl_Idelaymagic_ptr(aTHX))
 #undef  PL_diehook
 #define PL_diehook		(*Perl_Idiehook_ptr(aTHX))
+#undef  PL_dirty
+#define PL_dirty		(*Perl_Idirty_ptr(aTHX))
 #undef  PL_doextract
 #define PL_doextract		(*Perl_Idoextract_ptr(aTHX))
 #undef  PL_doswitches
@@ -252,8 +286,14 @@ END_EXTERN_C
 #define PL_dowarn		(*Perl_Idowarn_ptr(aTHX))
 #undef  PL_dumper_fd
 #define PL_dumper_fd		(*Perl_Idumper_fd_ptr(aTHX))
+#undef  PL_dumpindent
+#define PL_dumpindent		(*Perl_Idumpindent_ptr(aTHX))
 #undef  PL_e_script
 #define PL_e_script		(*Perl_Ie_script_ptr(aTHX))
+#undef  PL_efloatbuf
+#define PL_efloatbuf		(*Perl_Iefloatbuf_ptr(aTHX))
+#undef  PL_efloatsize
+#define PL_efloatsize		(*Perl_Iefloatsize_ptr(aTHX))
 #undef  PL_egid
 #define PL_egid			(*Perl_Iegid_ptr(aTHX))
 #undef  PL_encoding
@@ -266,6 +306,8 @@ END_EXTERN_C
 #define PL_errgv		(*Perl_Ierrgv_ptr(aTHX))
 #undef  PL_error_count
 #define PL_error_count		(*Perl_Ierror_count_ptr(aTHX))
+#undef  PL_errors
+#define PL_errors		(*Perl_Ierrors_ptr(aTHX))
 #undef  PL_euid
 #define PL_euid			(*Perl_Ieuid_ptr(aTHX))
 #undef  PL_eval_root
@@ -284,10 +326,14 @@ END_EXTERN_C
 #define PL_fdpid		(*Perl_Ifdpid_ptr(aTHX))
 #undef  PL_filemode
 #define PL_filemode		(*Perl_Ifilemode_ptr(aTHX))
+#undef  PL_firstgv
+#define PL_firstgv		(*Perl_Ifirstgv_ptr(aTHX))
 #undef  PL_forkprocess
 #define PL_forkprocess		(*Perl_Iforkprocess_ptr(aTHX))
 #undef  PL_formfeed
 #define PL_formfeed		(*Perl_Iformfeed_ptr(aTHX))
+#undef  PL_formtarget
+#define PL_formtarget		(*Perl_Iformtarget_ptr(aTHX))
 #undef  PL_generation
 #define PL_generation		(*Perl_Igeneration_ptr(aTHX))
 #undef  PL_gensym
@@ -306,10 +352,16 @@ END_EXTERN_C
 #define PL_hintgv		(*Perl_Ihintgv_ptr(aTHX))
 #undef  PL_hints
 #define PL_hints		(*Perl_Ihints_ptr(aTHX))
+#undef  PL_hv_fetch_ent_mh
+#define PL_hv_fetch_ent_mh	(*Perl_Ihv_fetch_ent_mh_ptr(aTHX))
+#undef  PL_hv_fetch_sv
+#define PL_hv_fetch_sv		(*Perl_Ihv_fetch_sv_ptr(aTHX))
 #undef  PL_in_clean_all
 #define PL_in_clean_all		(*Perl_Iin_clean_all_ptr(aTHX))
 #undef  PL_in_clean_objs
 #define PL_in_clean_objs	(*Perl_Iin_clean_objs_ptr(aTHX))
+#undef  PL_in_eval
+#define PL_in_eval		(*Perl_Iin_eval_ptr(aTHX))
 #undef  PL_in_load_module
 #define PL_in_load_module	(*Perl_Iin_load_module_ptr(aTHX))
 #undef  PL_incgv
@@ -322,6 +374,8 @@ END_EXTERN_C
 #define PL_isarev		(*Perl_Iisarev_ptr(aTHX))
 #undef  PL_known_layers
 #define PL_known_layers		(*Perl_Iknown_layers_ptr(aTHX))
+#undef  PL_last_in_gv
+#define PL_last_in_gv		(*Perl_Ilast_in_gv_ptr(aTHX))
 #undef  PL_last_swash_hv
 #define PL_last_swash_hv	(*Perl_Ilast_swash_hv_ptr(aTHX))
 #undef  PL_last_swash_key
@@ -334,12 +388,18 @@ END_EXTERN_C
 #define PL_last_swash_tmps	(*Perl_Ilast_swash_tmps_ptr(aTHX))
 #undef  PL_lastfd
 #define PL_lastfd		(*Perl_Ilastfd_ptr(aTHX))
+#undef  PL_lastgotoprobe
+#define PL_lastgotoprobe	(*Perl_Ilastgotoprobe_ptr(aTHX))
+#undef  PL_lastscream
+#define PL_lastscream		(*Perl_Ilastscream_ptr(aTHX))
 #undef  PL_laststatval
 #define PL_laststatval		(*Perl_Ilaststatval_ptr(aTHX))
 #undef  PL_laststype
 #define PL_laststype		(*Perl_Ilaststype_ptr(aTHX))
 #undef  PL_lineary
 #define PL_lineary		(*Perl_Ilineary_ptr(aTHX))
+#undef  PL_localizing
+#define PL_localizing		(*Perl_Ilocalizing_ptr(aTHX))
 #undef  PL_localpatches
 #define PL_localpatches		(*Perl_Ilocalpatches_ptr(aTHX))
 #undef  PL_lockhook
@@ -352,10 +412,20 @@ END_EXTERN_C
 #define PL_main_root		(*Perl_Imain_root_ptr(aTHX))
 #undef  PL_main_start
 #define PL_main_start		(*Perl_Imain_start_ptr(aTHX))
+#undef  PL_mainstack
+#define PL_mainstack		(*Perl_Imainstack_ptr(aTHX))
+#undef  PL_markstack
+#define PL_markstack		(*Perl_Imarkstack_ptr(aTHX))
+#undef  PL_markstack_max
+#define PL_markstack_max	(*Perl_Imarkstack_max_ptr(aTHX))
+#undef  PL_markstack_ptr
+#define PL_markstack_ptr	(*Perl_Imarkstack_ptr_ptr(aTHX))
 #undef  PL_max_intro_pending
 #define PL_max_intro_pending	(*Perl_Imax_intro_pending_ptr(aTHX))
 #undef  PL_maxo
 #define PL_maxo			(*Perl_Imaxo_ptr(aTHX))
+#undef  PL_maxscream
+#define PL_maxscream		(*Perl_Imaxscream_ptr(aTHX))
 #undef  PL_maxsysfd
 #define PL_maxsysfd		(*Perl_Imaxsysfd_ptr(aTHX))
 #undef  PL_memory_debug_header
@@ -378,6 +448,8 @@ END_EXTERN_C
 #define PL_minus_n		(*Perl_Iminus_n_ptr(aTHX))
 #undef  PL_minus_p
 #define PL_minus_p		(*Perl_Iminus_p_ptr(aTHX))
+#undef  PL_modcount
+#define PL_modcount		(*Perl_Imodcount_ptr(aTHX))
 #undef  PL_modglobal
 #define PL_modglobal		(*Perl_Imodglobal_ptr(aTHX))
 #undef  PL_multi_end
@@ -388,6 +460,8 @@ END_EXTERN_C
 #define PL_my_cxt_list		(*Perl_Imy_cxt_list_ptr(aTHX))
 #undef  PL_my_cxt_size
 #define PL_my_cxt_size		(*Perl_Imy_cxt_size_ptr(aTHX))
+#undef  PL_na
+#define PL_na			(*Perl_Ina_ptr(aTHX))
 #undef  PL_nice_chunk
 #define PL_nice_chunk		(*Perl_Inice_chunk_ptr(aTHX))
 #undef  PL_nice_chunk_size
@@ -402,10 +476,16 @@ END_EXTERN_C
 #define PL_numeric_radix_sv	(*Perl_Inumeric_radix_sv_ptr(aTHX))
 #undef  PL_numeric_standard
 #define PL_numeric_standard	(*Perl_Inumeric_standard_ptr(aTHX))
+#undef  PL_ofs_sv
+#define PL_ofs_sv		(*Perl_Iofs_sv_ptr(aTHX))
 #undef  PL_oldname
 #define PL_oldname		(*Perl_Ioldname_ptr(aTHX))
+#undef  PL_op
+#define PL_op			(*Perl_Iop_ptr(aTHX))
 #undef  PL_op_mask
 #define PL_op_mask		(*Perl_Iop_mask_ptr(aTHX))
+#undef  PL_opsave
+#define PL_opsave		(*Perl_Iopsave_ptr(aTHX))
 #undef  PL_origalen
 #define PL_origalen		(*Perl_Iorigalen_ptr(aTHX))
 #undef  PL_origargc
@@ -430,6 +510,8 @@ END_EXTERN_C
 #define PL_parser		(*Perl_Iparser_ptr(aTHX))
 #undef  PL_patchlevel
 #define PL_patchlevel		(*Perl_Ipatchlevel_ptr(aTHX))
+#undef  PL_peepp
+#define PL_peepp		(*Perl_Ipeepp_ptr(aTHX))
 #undef  PL_perl_destruct_level
 #define PL_perl_destruct_level	(*Perl_Iperl_destruct_level_ptr(aTHX))
 #undef  PL_perldb
@@ -458,16 +540,30 @@ END_EXTERN_C
 #define PL_reentrant_buffer	(*Perl_Ireentrant_buffer_ptr(aTHX))
 #undef  PL_reentrant_retint
 #define PL_reentrant_retint	(*Perl_Ireentrant_retint_ptr(aTHX))
+#undef  PL_reg_state
+#define PL_reg_state		(*Perl_Ireg_state_ptr(aTHX))
+#undef  PL_regdummy
+#define PL_regdummy		(*Perl_Iregdummy_ptr(aTHX))
 #undef  PL_regex_pad
 #define PL_regex_pad		(*Perl_Iregex_pad_ptr(aTHX))
 #undef  PL_regex_padav
 #define PL_regex_padav		(*Perl_Iregex_padav_ptr(aTHX))
+#undef  PL_reginterp_cnt
+#define PL_reginterp_cnt	(*Perl_Ireginterp_cnt_ptr(aTHX))
+#undef  PL_regmatch_slab
+#define PL_regmatch_slab	(*Perl_Iregmatch_slab_ptr(aTHX))
+#undef  PL_regmatch_state
+#define PL_regmatch_state	(*Perl_Iregmatch_state_ptr(aTHX))
 #undef  PL_rehash_seed
 #define PL_rehash_seed		(*Perl_Irehash_seed_ptr(aTHX))
 #undef  PL_rehash_seed_set
 #define PL_rehash_seed_set	(*Perl_Irehash_seed_set_ptr(aTHX))
 #undef  PL_replgv
 #define PL_replgv		(*Perl_Ireplgv_ptr(aTHX))
+#undef  PL_restartop
+#define PL_restartop		(*Perl_Irestartop_ptr(aTHX))
+#undef  PL_rs
+#define PL_rs			(*Perl_Irs_ptr(aTHX))
 #undef  PL_runops
 #define PL_runops		(*Perl_Irunops_ptr(aTHX))
 #undef  PL_runops_dbg
@@ -476,8 +572,26 @@ END_EXTERN_C
 #define PL_runops_std		(*Perl_Irunops_std_ptr(aTHX))
 #undef  PL_savebegin
 #define PL_savebegin		(*Perl_Isavebegin_ptr(aTHX))
+#undef  PL_savestack
+#define PL_savestack		(*Perl_Isavestack_ptr(aTHX))
+#undef  PL_savestack_ix
+#define PL_savestack_ix		(*Perl_Isavestack_ix_ptr(aTHX))
+#undef  PL_savestack_max
+#define PL_savestack_max	(*Perl_Isavestack_max_ptr(aTHX))
 #undef  PL_sawampersand
 #define PL_sawampersand		(*Perl_Isawampersand_ptr(aTHX))
+#undef  PL_scopestack
+#define PL_scopestack		(*Perl_Iscopestack_ptr(aTHX))
+#undef  PL_scopestack_ix
+#define PL_scopestack_ix	(*Perl_Iscopestack_ix_ptr(aTHX))
+#undef  PL_scopestack_max
+#define PL_scopestack_max	(*Perl_Iscopestack_max_ptr(aTHX))
+#undef  PL_screamfirst
+#define PL_screamfirst		(*Perl_Iscreamfirst_ptr(aTHX))
+#undef  PL_screamnext
+#define PL_screamnext		(*Perl_Iscreamnext_ptr(aTHX))
+#undef  PL_secondgv
+#define PL_secondgv		(*Perl_Isecondgv_ptr(aTHX))
 #undef  PL_sharehook
 #define PL_sharehook		(*Perl_Isharehook_ptr(aTHX))
 #undef  PL_sig_pending
@@ -492,12 +606,32 @@ END_EXTERN_C
 #define PL_slabs		(*Perl_Islabs_ptr(aTHX))
 #undef  PL_sort_RealCmp
 #define PL_sort_RealCmp		(*Perl_Isort_RealCmp_ptr(aTHX))
+#undef  PL_sortcop
+#define PL_sortcop		(*Perl_Isortcop_ptr(aTHX))
+#undef  PL_sortstash
+#define PL_sortstash		(*Perl_Isortstash_ptr(aTHX))
 #undef  PL_splitstr
 #define PL_splitstr		(*Perl_Isplitstr_ptr(aTHX))
 #undef  PL_srand_called
 #define PL_srand_called		(*Perl_Isrand_called_ptr(aTHX))
+#undef  PL_stack_base
+#define PL_stack_base		(*Perl_Istack_base_ptr(aTHX))
+#undef  PL_stack_max
+#define PL_stack_max		(*Perl_Istack_max_ptr(aTHX))
+#undef  PL_stack_sp
+#define PL_stack_sp		(*Perl_Istack_sp_ptr(aTHX))
+#undef  PL_start_env
+#define PL_start_env		(*Perl_Istart_env_ptr(aTHX))
 #undef  PL_stashcache
 #define PL_stashcache		(*Perl_Istashcache_ptr(aTHX))
+#undef  PL_statbuf
+#define PL_statbuf		(*Perl_Istatbuf_ptr(aTHX))
+#undef  PL_statcache
+#define PL_statcache		(*Perl_Istatcache_ptr(aTHX))
+#undef  PL_statgv
+#define PL_statgv		(*Perl_Istatgv_ptr(aTHX))
+#undef  PL_statname
+#define PL_statname		(*Perl_Istatname_ptr(aTHX))
 #undef  PL_statusvalue
 #define PL_statusvalue		(*Perl_Istatusvalue_ptr(aTHX))
 #undef  PL_statusvalue_posix
@@ -534,12 +668,28 @@ END_EXTERN_C
 #define PL_sys_intern		(*Perl_Isys_intern_ptr(aTHX))
 #undef  PL_taint_warn
 #define PL_taint_warn		(*Perl_Itaint_warn_ptr(aTHX))
+#undef  PL_tainted
+#define PL_tainted		(*Perl_Itainted_ptr(aTHX))
 #undef  PL_tainting
 #define PL_tainting		(*Perl_Itainting_ptr(aTHX))
 #undef  PL_threadhook
 #define PL_threadhook		(*Perl_Ithreadhook_ptr(aTHX))
+#undef  PL_timesbuf
+#define PL_timesbuf		(*Perl_Itimesbuf_ptr(aTHX))
+#undef  PL_tmps_floor
+#define PL_tmps_floor		(*Perl_Itmps_floor_ptr(aTHX))
+#undef  PL_tmps_ix
+#define PL_tmps_ix		(*Perl_Itmps_ix_ptr(aTHX))
+#undef  PL_tmps_max
+#define PL_tmps_max		(*Perl_Itmps_max_ptr(aTHX))
+#undef  PL_tmps_stack
+#define PL_tmps_stack		(*Perl_Itmps_stack_ptr(aTHX))
 #undef  PL_tokenbuf
 #define PL_tokenbuf		(*Perl_Itokenbuf_ptr(aTHX))
+#undef  PL_top_env
+#define PL_top_env		(*Perl_Itop_env_ptr(aTHX))
+#undef  PL_toptarget
+#define PL_toptarget		(*Perl_Itoptarget_ptr(aTHX))
 #undef  PL_uid
 #define PL_uid			(*Perl_Iuid_ptr(aTHX))
 #undef  PL_unicode
@@ -598,164 +748,12 @@ END_EXTERN_C
 #define PL_utf8locale		(*Perl_Iutf8locale_ptr(aTHX))
 #undef  PL_warnhook
 #define PL_warnhook		(*Perl_Iwarnhook_ptr(aTHX))
-#undef  PL_xmlfp
-#define PL_xmlfp		(*Perl_Ixmlfp_ptr(aTHX))
-#undef  PL_Sv
-#define PL_Sv			(*Perl_TSv_ptr(aTHX))
-#undef  PL_Xpv
-#define PL_Xpv			(*Perl_TXpv_ptr(aTHX))
-#undef  PL_av_fetch_sv
-#define PL_av_fetch_sv		(*Perl_Tav_fetch_sv_ptr(aTHX))
-#undef  PL_bodytarget
-#define PL_bodytarget		(*Perl_Tbodytarget_ptr(aTHX))
-#undef  PL_chopset
-#define PL_chopset		(*Perl_Tchopset_ptr(aTHX))
-#undef  PL_colors
-#define PL_colors		(*Perl_Tcolors_ptr(aTHX))
-#undef  PL_colorset
-#define PL_colorset		(*Perl_Tcolorset_ptr(aTHX))
-#undef  PL_curcop
-#define PL_curcop		(*Perl_Tcurcop_ptr(aTHX))
-#undef  PL_curpad
-#define PL_curpad		(*Perl_Tcurpad_ptr(aTHX))
-#undef  PL_curpm
-#define PL_curpm		(*Perl_Tcurpm_ptr(aTHX))
-#undef  PL_curstack
-#define PL_curstack		(*Perl_Tcurstack_ptr(aTHX))
-#undef  PL_curstackinfo
-#define PL_curstackinfo		(*Perl_Tcurstackinfo_ptr(aTHX))
-#undef  PL_curstash
-#define PL_curstash		(*Perl_Tcurstash_ptr(aTHX))
-#undef  PL_defoutgv
-#define PL_defoutgv		(*Perl_Tdefoutgv_ptr(aTHX))
-#undef  PL_defstash
-#define PL_defstash		(*Perl_Tdefstash_ptr(aTHX))
-#undef  PL_delayedisa
-#define PL_delayedisa		(*Perl_Tdelayedisa_ptr(aTHX))
-#undef  PL_delaymagic
-#define PL_delaymagic		(*Perl_Tdelaymagic_ptr(aTHX))
-#undef  PL_dirty
-#define PL_dirty		(*Perl_Tdirty_ptr(aTHX))
-#undef  PL_dumpindent
-#define PL_dumpindent		(*Perl_Tdumpindent_ptr(aTHX))
-#undef  PL_efloatbuf
-#define PL_efloatbuf		(*Perl_Tefloatbuf_ptr(aTHX))
-#undef  PL_efloatsize
-#define PL_efloatsize		(*Perl_Tefloatsize_ptr(aTHX))
-#undef  PL_errors
-#define PL_errors		(*Perl_Terrors_ptr(aTHX))
-#undef  PL_firstgv
-#define PL_firstgv		(*Perl_Tfirstgv_ptr(aTHX))
-#undef  PL_formtarget
-#define PL_formtarget		(*Perl_Tformtarget_ptr(aTHX))
-#undef  PL_hv_fetch_ent_mh
-#define PL_hv_fetch_ent_mh	(*Perl_Thv_fetch_ent_mh_ptr(aTHX))
-#undef  PL_hv_fetch_sv
-#define PL_hv_fetch_sv		(*Perl_Thv_fetch_sv_ptr(aTHX))
-#undef  PL_in_eval
-#define PL_in_eval		(*Perl_Tin_eval_ptr(aTHX))
-#undef  PL_last_in_gv
-#define PL_last_in_gv		(*Perl_Tlast_in_gv_ptr(aTHX))
-#undef  PL_lastgotoprobe
-#define PL_lastgotoprobe	(*Perl_Tlastgotoprobe_ptr(aTHX))
-#undef  PL_lastscream
-#define PL_lastscream		(*Perl_Tlastscream_ptr(aTHX))
-#undef  PL_localizing
-#define PL_localizing		(*Perl_Tlocalizing_ptr(aTHX))
-#undef  PL_mainstack
-#define PL_mainstack		(*Perl_Tmainstack_ptr(aTHX))
-#undef  PL_markstack
-#define PL_markstack		(*Perl_Tmarkstack_ptr(aTHX))
-#undef  PL_markstack_max
-#define PL_markstack_max	(*Perl_Tmarkstack_max_ptr(aTHX))
-#undef  PL_markstack_ptr
-#define PL_markstack_ptr	(*Perl_Tmarkstack_ptr_ptr(aTHX))
-#undef  PL_maxscream
-#define PL_maxscream		(*Perl_Tmaxscream_ptr(aTHX))
-#undef  PL_modcount
-#define PL_modcount		(*Perl_Tmodcount_ptr(aTHX))
-#undef  PL_na
-#define PL_na			(*Perl_Tna_ptr(aTHX))
-#undef  PL_ofs_sv
-#define PL_ofs_sv		(*Perl_Tofs_sv_ptr(aTHX))
-#undef  PL_op
-#define PL_op			(*Perl_Top_ptr(aTHX))
-#undef  PL_opsave
-#define PL_opsave		(*Perl_Topsave_ptr(aTHX))
-#undef  PL_peepp
-#define PL_peepp		(*Perl_Tpeepp_ptr(aTHX))
-#undef  PL_reg_state
-#define PL_reg_state		(*Perl_Treg_state_ptr(aTHX))
-#undef  PL_regdummy
-#define PL_regdummy		(*Perl_Tregdummy_ptr(aTHX))
-#undef  PL_reginterp_cnt
-#define PL_reginterp_cnt	(*Perl_Treginterp_cnt_ptr(aTHX))
-#undef  PL_regmatch_slab
-#define PL_regmatch_slab	(*Perl_Tregmatch_slab_ptr(aTHX))
-#undef  PL_regmatch_state
-#define PL_regmatch_state	(*Perl_Tregmatch_state_ptr(aTHX))
-#undef  PL_restartop
-#define PL_restartop		(*Perl_Trestartop_ptr(aTHX))
-#undef  PL_rs
-#define PL_rs			(*Perl_Trs_ptr(aTHX))
-#undef  PL_savestack
-#define PL_savestack		(*Perl_Tsavestack_ptr(aTHX))
-#undef  PL_savestack_ix
-#define PL_savestack_ix		(*Perl_Tsavestack_ix_ptr(aTHX))
-#undef  PL_savestack_max
-#define PL_savestack_max	(*Perl_Tsavestack_max_ptr(aTHX))
-#undef  PL_scopestack
-#define PL_scopestack		(*Perl_Tscopestack_ptr(aTHX))
-#undef  PL_scopestack_ix
-#define PL_scopestack_ix	(*Perl_Tscopestack_ix_ptr(aTHX))
-#undef  PL_scopestack_max
-#define PL_scopestack_max	(*Perl_Tscopestack_max_ptr(aTHX))
-#undef  PL_screamfirst
-#define PL_screamfirst		(*Perl_Tscreamfirst_ptr(aTHX))
-#undef  PL_screamnext
-#define PL_screamnext		(*Perl_Tscreamnext_ptr(aTHX))
-#undef  PL_secondgv
-#define PL_secondgv		(*Perl_Tsecondgv_ptr(aTHX))
-#undef  PL_sortcop
-#define PL_sortcop		(*Perl_Tsortcop_ptr(aTHX))
-#undef  PL_sortstash
-#define PL_sortstash		(*Perl_Tsortstash_ptr(aTHX))
-#undef  PL_stack_base
-#define PL_stack_base		(*Perl_Tstack_base_ptr(aTHX))
-#undef  PL_stack_max
-#define PL_stack_max		(*Perl_Tstack_max_ptr(aTHX))
-#undef  PL_stack_sp
-#define PL_stack_sp		(*Perl_Tstack_sp_ptr(aTHX))
-#undef  PL_start_env
-#define PL_start_env		(*Perl_Tstart_env_ptr(aTHX))
-#undef  PL_statbuf
-#define PL_statbuf		(*Perl_Tstatbuf_ptr(aTHX))
-#undef  PL_statcache
-#define PL_statcache		(*Perl_Tstatcache_ptr(aTHX))
-#undef  PL_statgv
-#define PL_statgv		(*Perl_Tstatgv_ptr(aTHX))
-#undef  PL_statname
-#define PL_statname		(*Perl_Tstatname_ptr(aTHX))
-#undef  PL_tainted
-#define PL_tainted		(*Perl_Ttainted_ptr(aTHX))
-#undef  PL_timesbuf
-#define PL_timesbuf		(*Perl_Ttimesbuf_ptr(aTHX))
-#undef  PL_tmps_floor
-#define PL_tmps_floor		(*Perl_Ttmps_floor_ptr(aTHX))
-#undef  PL_tmps_ix
-#define PL_tmps_ix		(*Perl_Ttmps_ix_ptr(aTHX))
-#undef  PL_tmps_max
-#define PL_tmps_max		(*Perl_Ttmps_max_ptr(aTHX))
-#undef  PL_tmps_stack
-#define PL_tmps_stack		(*Perl_Ttmps_stack_ptr(aTHX))
-#undef  PL_top_env
-#define PL_top_env		(*Perl_Ttop_env_ptr(aTHX))
-#undef  PL_toptarget
-#define PL_toptarget		(*Perl_Ttoptarget_ptr(aTHX))
 #undef  PL_watchaddr
-#define PL_watchaddr		(*Perl_Twatchaddr_ptr(aTHX))
+#define PL_watchaddr		(*Perl_Iwatchaddr_ptr(aTHX))
 #undef  PL_watchok
-#define PL_watchok		(*Perl_Twatchok_ptr(aTHX))
+#define PL_watchok		(*Perl_Iwatchok_ptr(aTHX))
+#undef  PL_xmlfp
+#define PL_xmlfp		(*Perl_Ixmlfp_ptr(aTHX))
 #undef  PL_No
 #define PL_No			(*Perl_GNo_ptr(NULL))
 #undef  PL_Yes