From: Nicholas Clark <nick@ccl4.org>
Date: Mon, 14 May 2007 22:32:16 +0000 (+0000)
Subject: PERL_IMPLICIT_CONTEXT is usually defined for threads, so assume that
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a4021b77cd29f9c157cba167a52eb3525afaf9ac;p=p5sagit%2Fp5-mst-13.2.git

PERL_IMPLICIT_CONTEXT is usually defined for threads, so assume that
its int needs a friend under LP64.
gcc -Wpaddedspotted padding I'd missed in thrdvar.h

p4raw-id: //depot/perl@31217
---

diff --git a/intrpvar.h b/intrpvar.h
index 2bb2f88..7b5272d 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -189,6 +189,8 @@ PERLVAR(Imess_sv,	SV *)
 PERLVAR(Iors_sv,	SV *)		/* output record separator $\ */
 /* statics moved here for shared library purposes */
 PERLVARI(Igensym,	I32,	0)	/* next symbol for getsym() to define */
+PERLVAR(Ierror_count,	U8)		/* how many errors so far, max 10 */
+PERLVARI(Icv_has_eval, bool, FALSE) /* PL_compcv includes an entereval or similar */
 PERLVARI(Ilaststype,	U16,	OP_STAT)
 PERLVARI(Ilaststatval,	int,	-1)
 
@@ -282,12 +284,6 @@ PERLVAR(Isv_undef,	SV)
 PERLVAR(Isv_no,		SV)
 PERLVAR(Isv_yes,	SV)
 
-PERLVAR(Ierror_count,	U8)		/* how many errors so far, max 10 */
-PERLVARI(Icv_has_eval, bool, FALSE) /* PL_compcv includes an entereval or similar */
-/* Space for two more U8 here without increasing the structure size */
-
-PERLVAR(Imulti_end,	I32)		/* last line of multi-line string */
-
 PERLVAR(Isubname,	SV *)		/* name of current subroutine */
 
 PERLVAR(Isubline,	I32)		/* line this subroutine began on */
@@ -490,6 +486,8 @@ PERLVARI(Irehash_seed, UV, 0)		/* 582 hash initializer */
 PERLVARI(Idumper_fd, int, -1)
 #endif
 
+PERLVAR(Imulti_end,	I32)		/* last line of multi-line string */
+
 #ifdef PERL_IMPLICIT_CONTEXT
 PERLVARI(Imy_cxt_size, int, 0)		/* size of PL_my_cxt_list */
 PERLVARI(Imy_cxt_list, void **, NULL) /* per-module array of MY_CXT pointers */
diff --git a/thrdvar.h b/thrdvar.h
index cbde17d..d2fb31d 100644
--- a/thrdvar.h
+++ b/thrdvar.h
@@ -152,7 +152,12 @@ PERLVAR(Tscreamnext,	I32 *)
 PERLVAR(Tlastscream,	SV *)
 
 PERLVAR(Treg_state,	struct re_save_state)
+
 PERLVAR(Tregdummy,	regnode)	/* from regcomp.c */
+
+PERLVARI(Tdumpindent,	U16, 4)		/* # of blanks per dump indentation level */
+/* Space for U16 here without increasing the structure size */
+
 PERLVARA(Tcolors,6,	char *)		/* from regcomp.c */
 
 PERLVARI(Tpeepp,	peep_t, MEMBER_TO_FPTR(Perl_peep))
@@ -172,8 +177,6 @@ PERLVAR(Twatchok,	char *)
 PERLVARI(Tregmatch_slab,	regmatch_slab *, NULL)
 PERLVAR(Tregmatch_state,	regmatch_state *)
 
-PERLVARI(Tdumpindent,	U16, 4)		/* # of blanks per dump indentation level */
-
 PERLVARI(Tdelayedisa,	HV*, NULL)      /* stash for PL_delaymagic for magic_setisa */
 
 /* Put anything new that is pointer aligned here. */