Create a struct to use as the header with PERL_TRACK_MEMPOOL, so that

other information can be stored in it.

p4raw-id: //depot/perl@26474

1 files changed, 10 insertions, 3 deletions

diff --git a/perl.h b/perl.h
index 4d8e719678..b31418418b 100644
--- a/perl.h
+++ b/perl.h
@@ -138,6 +138,8 @@
 
 #define pVAR    register struct perl_vars* my_vars PERL_UNUSED_DECL
 
+typedef struct interpreter PerlInterpreter;
+
 #ifdef PERL_GLOBAL_STRUCT
 #  define dVAR		pVAR    = (struct perl_vars*)PERL_GET_VARS()
 #else
@@ -149,7 +151,14 @@
 #    define MULTIPLICITY
 #  endif
 #  define tTHX	PerlInterpreter*
-#  define sTHX	(sizeof(tTHX) + (MEM_ALIGNBYTES - sizeof(tTHX)%MEM_ALIGNBYTES) % MEM_ALIGNBYTES)
+
+struct perl_memory_debug_header {
+  tTHX	interpreter;
+};
+
+#  define sTHX	(sizeof(struct perl_memory_debug_header) + \
+	(MEM_ALIGNBYTES - sizeof(struct perl_memory_debug_header) \
+	 %MEM_ALIGNBYTES) % MEM_ALIGNBYTES)
 #  define pTHX	register tTHX my_perl PERL_UNUSED_DECL
 #  define aTHX	my_perl
 #  ifdef PERL_GLOBAL_STRUCT
@@ -2155,8 +2164,6 @@ typedef struct padop PADOP;
 typedef struct pvop PVOP;
 typedef struct loop LOOP;
 
-typedef struct interpreter PerlInterpreter;
-
 /* Amdahl's <ksync.h> has struct sv */
 /* SGI's <sys/sema.h> has struct sv */
 #if defined(UTS) || defined(__sgi)