Fix the test count in t/re/pat.t

[perl5.git] / av.h

diff --git a/av.h b/av.h
index 77df033..5231c4d 100644 (file)
--- a/av.h
+++ b/av.h
@@ -8,29 +8,14 @@
  *
  */
 
-#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,7 +57,7 @@ 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_ MUTABLE_AV(av)))