X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/a4a439fb9cd74c575855119abb55dc091955bdf4..dd0f8ff2d050f302c0dd99da2626c4cef41ec422:/intrpvar.h

diff --git a/intrpvar.h b/intrpvar.h
index ca1bb71..63bc4d1 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -490,8 +490,8 @@ PERLVAR(I, compiling,	COP)		/* compiling/done executing marker */
 
 PERLVAR(I, compcv,	CV *)		/* currently compiling subroutine */
 PERLVAR(I, comppad_name, PADNAMELIST *)	/* variable names for "my" variables */
-PERLVAR(I, comppad_name_fill,	I32)	/* last "introduced" variable offset */
-PERLVAR(I, comppad_name_floor,	I32)	/* start of vars in innermost block */
+PERLVAR(I, comppad_name_fill,	PADOFFSET)/* last "introduced" variable offset */
+PERLVAR(I, comppad_name_floor,	PADOFFSET)/* start of vars in innermost block */
 
 #ifdef HAVE_INTERP_INTERN
 PERLVAR(I, sys_intern,	struct interp_intern)
@@ -543,21 +543,21 @@ PERLVARA(I, body_roots,	PERL_ARENA_ROOTS_SIZE, void*) /* array of body roots */
 
 PERLVAR(I, debug,	VOL U32)	/* flags given to -D switch */
 
-PERLVARI(I, maxo,	int,	MAXO)	/* maximum number of ops */
+PERLVARI(I, padlist_generation, U32, 1)	/* id to identify padlist clones */
 
 PERLVARI(I, runops,	runops_proc_t, RUNOPS_DEFAULT)
 
 PERLVAR(I, subname,	SV *)		/* name of current subroutine */
 
 PERLVAR(I, subline,	I32)		/* line this subroutine began on */
-PERLVAR(I, min_intro_pending, I32)	/* start of vars to introduce */
+PERLVAR(I, min_intro_pending, PADOFFSET)/* start of vars to introduce */
 
-PERLVAR(I, max_intro_pending, I32)	/* end of vars to introduce */
-PERLVAR(I, padix,	I32)		/* lowest unused index - 1
+PERLVAR(I, max_intro_pending, PADOFFSET)/* end of vars to introduce */
+PERLVAR(I, padix,	PADOFFSET)	/* lowest unused index - 1
 					   in current "register" pad */
-PERLVAR(I, constpadix,	I32)		/* lowest unused for constants */
+PERLVAR(I, constpadix,	PADOFFSET)	/* lowest unused for constants */
 
-PERLVAR(I, padix_floor,	I32)		/* how low may inner block reset padix */
+PERLVAR(I, padix_floor,	PADOFFSET)	/* how low may inner block reset padix */
 
 #ifdef USE_LOCALE_COLLATE
 PERLVAR(I, collation_name, char *)	/* Name of current collation */
@@ -695,9 +695,6 @@ PERLVARI(I, known_layers, PerlIO_list_t *, NULL)
 PERLVARI(I, def_layerlist, PerlIO_list_t *, NULL)
 #endif
 
-PERLVARI(I, encoding,	SV *,	NULL)	/* $^ENCODING */
-PERLVARI(I, lex_encoding, SV *,	NULL)	/* encoding pragma */
-
 PERLVAR(I, utf8_idstart, SV *)
 PERLVAR(I, utf8_idcont,	SV *)
 PERLVAR(I, utf8_xidstart, SV *)
@@ -765,8 +762,6 @@ PERLVAR(I, debug_pad,	struct perl_debug_pad)	/* always needed because of the re
 /* Hook for File::Glob */
 PERLVARI(I, globhook,	globhook_t, NULL)
 
-PERLVARI(I, padlist_generation, U32, 1)	/* id to identify padlist clones */
-
 /* The last unconditional member of the interpreter structure when 5.18.0 was
    released. The offset of the end of this is baked into a global variable in 
    any shared perl library which will allow a sanity test in future perl