From 232d1c150c060ca27ef1d2d4770fed5de0e66c01 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Mon, 20 Feb 2006 20:32:09 +0000
Subject: [PATCH] Steal code from maint, and use PERL_ARENA_ROOTS_SIZE to size
 the arena arrays, rather than SVt_LAST, so that SVt_LAST can truthfully
 remain the number of genuine SV types, unclouded by implementation details.

p4raw-id: //depot/perl@27251
---
 intrpvar.h | 2 +-
 sv.c       | 2 +-
 sv.h       | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/intrpvar.h b/intrpvar.h
index 4c63b08042..76be01d312 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -248,7 +248,7 @@ PERLVAR(Iosname,	char *)		/* operating system */
 
 PERLVAR(Isighandlerp,	Sighandler_t)
 
-PERLVARA(Ibody_roots,	SVt_LAST, void*) /* array of body roots */
+PERLVARA(Ibody_roots,	PERL_ARENA_ROOTS_SIZE, void*) /* array of body roots */
 
 PERLVAR(Inice_chunk,	char *)		/* a nice chunk of memory to reuse */
 PERLVAR(Inice_chunk_size,	U32)	/* how nice the chunk of memory is */
diff --git a/sv.c b/sv.c
index f4e661cea9..11f79dba33 100644
--- a/sv.c
+++ b/sv.c
@@ -643,7 +643,7 @@ Perl_sv_free_arenas(pTHX)
     S_free_arena(aTHX_ (void**) PL_body_arenas);
 #endif
 
-    for (i=0; i<SVt_LAST; i++)
+    for (i=0; i<PERL_ARENA_ROOTS_SIZE; i++)
 	PL_body_roots[i] = 0;
 
     Safefree(PL_nice_chunk);
diff --git a/sv.h b/sv.h
index 88d3cf89df..09a27d5bc0 100644
--- a/sv.h
+++ b/sv.h
@@ -75,6 +75,8 @@ typedef enum {
 #define HE_SVSLOT	SVt_NULL
 #endif
 
+#define PERL_ARENA_ROOTS_SIZE	(SVt_LAST)
+
 /* typedefs to eliminate some typing */
 typedef struct he HE;
 typedef struct hek HEK;
-- 
2.34.1