X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=av.h;h=5231c4d4ce55b48f305c79b60f5b536204ef944a;hb=c2dc4c7d5e51c6211637044820c7a560da7e6268;hp=88740450992ecefd42e3707c06906d4b6e28af0b;hpb=3ae1b22641a16d4d08aba688616c0f7cefb7d1f5;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/av.h b/av.h
index 8874045..5231c4d 100644
--- a/av.h
+++ b/av.h
@@ -1,36 +1,21 @@
 /*    av.h
  *
- *    Copyright (C) 1991, 1992, 1993, 1995, 1996, 1997, 1998, 1999,
- *    2000, 2001, 2002, 2005, 2006, 2007, by Larry Wall and others
+ *    Copyright (C) 1991, 1992, 1993, 1995, 1996, 1997, 1998, 1999, 2000,
+ *    2001, 2002, 2005, 2006, 2007, 2008, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
  */
 
-#define _XPVAV_ALLOCATED_HEAD						\
-    SSize_t	xav_fill;       /* Index of last element present */	\
-    SSize_t	xav_max         /* max index for which array has space */
-
-#define _XPVAV_HEAD	\
-    union _xnvu xnv_u;	\
-    _XPVAV_ALLOCATED_HEAD
-
 struct xpvav {
-    _XPVAV_HEAD;
-    _XPVMG_HEAD;
+    HV*		xmg_stash;	/* class package */
+    union _xmgu	xmg_u;
+    SSize_t	xav_fill;       /* Index of last element present */
+    SSize_t	xav_max;        /* max index for which array has space */
+    SV**	xav_alloc;	/* pointer to beginning of C array of SVs */
 };
 
-typedef struct {
-    _XPVAV_ALLOCATED_HEAD;
-    _XPVMG_HEAD;
-} xpvav_allocated;
-
-#undef _XPVAV_ALLOCATED_HEAD
-#undef _XPVAV_HEAD
-
-/* SV**	xav_alloc; */
-#define xav_alloc xiv_u.xivu_p1
 /* SV*	xav_arylen; */
 
 /* SVpav_REAL is set for all AVs whose xav_array contents are refcounted.
@@ -72,10 +57,10 @@ Same as C<av_len()>.  Deprecated, use C<av_len()> instead.
 #endif
 
 #define AvARRAY(av)	((av)->sv_u.svu_array)
-#define AvALLOC(av)	(*((SV***)&((XPVAV*)  SvANY(av))->xav_alloc))
+#define AvALLOC(av)	((XPVAV*)  SvANY(av))->xav_alloc
 #define AvMAX(av)	((XPVAV*)  SvANY(av))->xav_max
 #define AvFILLp(av)	((XPVAV*)  SvANY(av))->xav_fill
-#define AvARYLEN(av)	(*Perl_av_arylen_p(aTHX_ (AV*)av))
+#define AvARYLEN(av)	(*Perl_av_arylen_p(aTHX_ MUTABLE_AV(av)))
 
 #define AvREAL(av)	(SvFLAGS(av) & SVpav_REAL)
 #define AvREAL_on(av)	(SvFLAGS(av) |= SVpav_REAL)
@@ -88,8 +73,8 @@ Same as C<av_len()>.  Deprecated, use C<av_len()> instead.
 
 #define AvREALISH(av)	(SvFLAGS(av) & (SVpav_REAL|SVpav_REIFY))
                                           
-#define AvFILL(av)	((SvRMAGICAL((SV *) (av))) \
-			  ? mg_size((SV *) av) : AvFILLp(av))
+#define AvFILL(av)	((SvRMAGICAL((const SV *) (av))) \
+			 ? mg_size(MUTABLE_SV(av)) : AvFILLp(av))
 
 #define NEGATIVE_INDICES_VAR "NEGATIVE_INDICES"
 
@@ -101,7 +86,7 @@ Creates a new AV.  The reference count is set to 1.
 =cut
 */
 
-#define newAV()	((AV *)newSV_type(SVt_PVAV))
+#define newAV()	MUTABLE_AV(newSV_type(SVt_PVAV))
 
 /*
  * Local variables: