X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=intrpvar.h;h=a291d393ca963f5964e5790f8c676dbaaa672c73;hb=b0ce926a45891e83ffb4badae874161f93c0eb49;hp=744ff314509254cd41b4fa0653fd2a348214e9a6;hpb=43165c0500446fb6e4a036657f82b50e22c886e0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/intrpvar.h b/intrpvar.h
index 744ff31..a291d39 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -26,7 +26,7 @@ PERLVAR(Iwarnhook,	SV *)
 PERLVAR(Iparsehook,	SV *)
 PERLVAR(Icddir,		char *)		/* switches */
 PERLVAR(Iminus_c,	bool)
-PERLVAR(Ipatchlevel[10],char)
+PERLVARA(Ipatchlevel,10,char)
 PERLVAR(Ilocalpatches,	char **)
 PERLVARI(Isplitstr,	char *,	" ")
 PERLVAR(Ipreprocess,	bool)
@@ -200,10 +200,10 @@ PERLVARI(Ithreadnum,	U32,	0)	/* incremented each thread creation */
 PERLVAR(Istrtab_mutex,	perl_mutex)	/* Mutex for string table access */
 #endif /* USE_THREADS */
 
-PERLVAR(Iuid,		int)		/* current real user id */
-PERLVAR(Ieuid,		int)		/* current effective user id */
-PERLVAR(Igid,		int)		/* current real group id */
-PERLVAR(Iegid,		int)		/* current effective group id */
+PERLVAR(Iuid,		Uid_t)		/* current real user id */
+PERLVAR(Ieuid,		Uid_t)		/* current effective user id */
+PERLVAR(Igid,		Gid_t)		/* current real group id */
+PERLVAR(Iegid,		Gid_t)		/* current effective group id */
 PERLVAR(Inomemok,	bool)		/* let malloc context handle nomem */
 PERLVAR(Ian,		U32)		/* malloc sequence number */
 PERLVAR(Icop_seqmax,	U32)		/* statement sequence number */
@@ -219,16 +219,16 @@ PERLVAR(Isighandlerp,	Sighandler_t)
 
 PERLVAR(Ixiv_arenaroot,	XPV*)		/* list of allocated xiv areas */
 PERLVAR(Ixiv_root,	IV *)		/* free xiv list--shared by interpreters */
-PERLVAR(Ixnv_root,	double *)	/* free xnv list--shared by interpreters */
+PERLVAR(Ixnv_root,	NV *)		/* free xnv list--shared by interpreters */
 PERLVAR(Ixrv_root,	XRV *)		/* free xrv list--shared by interpreters */
 PERLVAR(Ixpv_root,	XPV *)		/* free xpv list--shared by interpreters */
 PERLVAR(Ihe_root,	HE *)		/* free he list--shared by interpreters */
 PERLVAR(Inice_chunk,	char *)		/* a nice chunk of memory to reuse */
 PERLVAR(Inice_chunk_size,	U32)	/* how nice the chunk of memory is */
 
-PERLVARI(Irunops,	runops_proc_t,	FUNC_NAME_TO_PTR(RUNOPS_DEFAULT))
+PERLVARI(Irunops,	runops_proc_t,	MEMBER_TO_FPTR(RUNOPS_DEFAULT))
 
-PERLVAR(Itokenbuf[256],	char)
+PERLVARA(Itokenbuf,256,	char)
 
 PERLVAR(Isv_undef,	SV)
 PERLVAR(Isv_no,		SV)
@@ -257,8 +257,8 @@ PERLVAR(Ilex_brackstack,char *)		/* what kind of brackets to pop */
 PERLVAR(Ilex_casestack,	char *)		/* what kind of case mods in effect */
 
 /* What we know when we're in LEX_KNOWNEXT state. */
-PERLVAR(Inextval[5],	YYSTYPE)	/* value of next token, if any */
-PERLVAR(Inexttype[5],	I32)		/* type of next token */
+PERLVARA(Inextval,5,	YYSTYPE)	/* value of next token, if any */
+PERLVARA(Inexttype,5,	I32)		/* type of next token */
 PERLVAR(Inexttoke,	I32)
 
 PERLVAR(Ilinestr,	SV *)
@@ -315,24 +315,32 @@ PERLVARI(Inumeric_standard,	bool,	TRUE)
 					/* Assume simple numerics */
 PERLVARI(Inumeric_local,	bool,	TRUE)
 					/* Assume local numerics */
+PERLVAR(Inumeric_radix,		char)
+					/* The radix character if not '.' */
 
 #endif /* !USE_LOCALE_NUMERIC */
 
 /* utf8 character classes */
 PERLVAR(Iutf8_alnum,	SV *)
+PERLVAR(Iutf8_alnumc,	SV *)
+PERLVAR(Iutf8_ascii,	SV *)
 PERLVAR(Iutf8_alpha,	SV *)
 PERLVAR(Iutf8_space,	SV *)
+PERLVAR(Iutf8_cntrl,	SV *)
+PERLVAR(Iutf8_graph,	SV *)
 PERLVAR(Iutf8_digit,	SV *)
 PERLVAR(Iutf8_upper,	SV *)
 PERLVAR(Iutf8_lower,	SV *)
 PERLVAR(Iutf8_print,	SV *)
+PERLVAR(Iutf8_punct,	SV *)
+PERLVAR(Iutf8_xdigit,	SV *)
 PERLVAR(Iutf8_mark,	SV *)
 PERLVAR(Iutf8_toupper,	SV *)
 PERLVAR(Iutf8_totitle,	SV *)
 PERLVAR(Iutf8_tolower,	SV *)
 PERLVAR(Ilast_swash_hv,	HV *)
 PERLVAR(Ilast_swash_klen,	U32)
-PERLVAR(Ilast_swash_key[10],	U8)
+PERLVARA(Ilast_swash_key,10,	U8)
 PERLVAR(Ilast_swash_tmps,	U8 *)
 PERLVAR(Ilast_swash_slen,	STRLEN)
 
@@ -348,7 +356,7 @@ PERLVAR(Iglob_index,	int)
 PERLVAR(Iefloatbuf,	char*)
 PERLVAR(Iefloatsize,	STRLEN)
 PERLVAR(Isrand_called,	bool)
-PERLVAR(Iuudmap[256],	char)
+PERLVARA(Iuudmap,256,	char)
 PERLVAR(Ibitcount,	char *)
 PERLVAR(Ifilter_debug,	int)
 
@@ -374,12 +382,12 @@ PERLVAR(Icred_mutex,	perl_mutex)	/* altered credentials in effect */
 
 #endif /* USE_THREADS */
 
-#ifdef PERL_OBJECT
-PERLVARI(piMem,		IPerlMem*,  NULL)
-PERLVARI(piENV,		IPerlEnv*,  NULL)
-PERLVARI(piStdIO,	IPerlStdIO*, NULL)
-PERLVARI(piLIO,		IPerlLIO*,  NULL)
-PERLVARI(piDir,		IPerlDir*,  NULL)
-PERLVARI(piSock,	IPerlSock*, NULL)
-PERLVARI(piProc,	IPerlProc*, NULL)
+#if defined(PERL_IMPLICIT_SYS)
+PERLVARI(IMem,		struct IPerlMem*,  NULL)
+PERLVARI(IEnv,		struct IPerlEnv*,  NULL)
+PERLVARI(IStdIO,	struct IPerlStdIO*, NULL)
+PERLVARI(ILIO,		struct IPerlLIO*,  NULL)
+PERLVARI(IDir,		struct IPerlDir*,  NULL)
+PERLVARI(ISock,		struct IPerlSock*, NULL)
+PERLVARI(IProc,		struct IPerlProc*, NULL)
 #endif