#define PL_utf8_upper (PERL_GET_INTERP->Iutf8_upper)
#define PL_utf8_xdigit (PERL_GET_INTERP->Iutf8_xdigit)
#define PL_uudmap (PERL_GET_INTERP->Iuudmap)
+#define PL_wantutf8 (PERL_GET_INTERP->Iwantutf8)
#define PL_warnhook (PERL_GET_INTERP->Iwarnhook)
#define PL_widesyscalls (PERL_GET_INTERP->Iwidesyscalls)
#define PL_xiv_arenaroot (PERL_GET_INTERP->Ixiv_arenaroot)
#define PL_utf8_upper (vTHX->Iutf8_upper)
#define PL_utf8_xdigit (vTHX->Iutf8_xdigit)
#define PL_uudmap (vTHX->Iuudmap)
+#define PL_wantutf8 (vTHX->Iwantutf8)
#define PL_warnhook (vTHX->Iwarnhook)
#define PL_widesyscalls (vTHX->Iwidesyscalls)
#define PL_xiv_arenaroot (vTHX->Ixiv_arenaroot)
#define PL_Iutf8_upper PL_utf8_upper
#define PL_Iutf8_xdigit PL_utf8_xdigit
#define PL_Iuudmap PL_uudmap
+#define PL_Iwantutf8 PL_wantutf8
#define PL_Iwarnhook PL_warnhook
#define PL_Iwidesyscalls PL_widesyscalls
#define PL_Ixiv_arenaroot PL_xiv_arenaroot
#define PL_curinterp (PL_Vars.Gcurinterp)
#define PL_do_undump (PL_Vars.Gdo_undump)
#define PL_hexdigit (PL_Vars.Ghexdigit)
+#define PL_lockhook (PL_Vars.Glockhook)
#define PL_malloc_mutex (PL_Vars.Gmalloc_mutex)
#define PL_op_mutex (PL_Vars.Gop_mutex)
#define PL_patleave (PL_Vars.Gpatleave)
#define PL_runops_dbg (PL_Vars.Grunops_dbg)
#define PL_runops_std (PL_Vars.Grunops_std)
-#define PL_sharedsv_space (PL_Vars.Gsharedsv_space)
-#define PL_sharedsv_space_mutex (PL_Vars.Gsharedsv_space_mutex)
+#define PL_sharehook (PL_Vars.Gsharehook)
#define PL_thr_key (PL_Vars.Gthr_key)
+#define PL_unlockhook (PL_Vars.Gunlockhook)
#else /* !PERL_GLOBAL_STRUCT */
#define PL_Gcurinterp PL_curinterp
#define PL_Gdo_undump PL_do_undump
#define PL_Ghexdigit PL_hexdigit
+#define PL_Glockhook PL_lockhook
#define PL_Gmalloc_mutex PL_malloc_mutex
#define PL_Gop_mutex PL_op_mutex
#define PL_Gpatleave PL_patleave
#define PL_Grunops_dbg PL_runops_dbg
#define PL_Grunops_std PL_runops_std
-#define PL_Gsharedsv_space PL_sharedsv_space
-#define PL_Gsharedsv_space_mutex PL_sharedsv_space_mutex
+#define PL_Gsharehook PL_sharehook
#define PL_Gthr_key PL_thr_key
+#define PL_Gunlockhook PL_unlockhook
#endif /* PERL_GLOBAL_STRUCT */