X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=malloc.c;h=fe0b66dd70a6ace7f01144aa70280e0491813c9c;hb=e71c662575b0eacf7e7e6e47ee6a2e23313ee8e7;hp=42c2d651c69c9f22134104c63a340c5c9069cdc2;hpb=ef9f17be917c8cd6b7df3ddfb35bc3e8431ce7b1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/malloc.c b/malloc.c
index 42c2d65..fe0b66d 100644
--- a/malloc.c
+++ b/malloc.c
@@ -351,7 +351,7 @@
 #  undef DEBUG_m
 #  define DEBUG_m(a)  \
     STMT_START {							\
-	if (PERL_GET_INTERP) { dTHX; if (PL_debug & 128) { a; } }	\
+	if (PERL_GET_INTERP) { dTHX; if (DEBUG_m_TEST) { a; } }	\
     } STMT_END
 #endif
 
@@ -886,18 +886,12 @@ static	union overhead *nextf[NBUCKETS];
 #endif
 
 #ifdef USE_PERL_SBRK
-#define sbrk(a) Perl_sbrk(a)
+# define sbrk(a) Perl_sbrk(a)
 Malloc_t Perl_sbrk (int size);
-#else 
-#ifdef DONT_DECLARE_STD
-#ifdef I_UNISTD
-#include <unistd.h>
-#endif
 #else
-#ifndef HAS_SBRK_PROTO
+# ifndef HAS_SBRK_PROTO /* <unistd.h> usually takes care of this */
 extern	Malloc_t sbrk(int);
-#endif
-#endif
+# endif
 #endif
 
 #ifdef DEBUGGING_MSTATS
@@ -1102,7 +1096,7 @@ Perl_malloc(register size_t nbytes)
 
 	DEBUG_m(PerlIO_printf(Perl_debug_log,
 			      "0x%"UVxf": (%05lu) malloc %ld bytes\n",
-			      PTR2UV(p+1), (unsigned long)(PL_an++),
+			      PTR2UV(p), (unsigned long)(PL_an++),
 			      (long)size));
 
 	/* remove from linked list */