X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=malloc.c;h=6a2ff15547534a81d82cd839b6d14845cac46b50;hb=0af80b6034aad516a126a9414dadccac4de7f9dc;hp=0345ef97d0fd8fbb0ae974ce2855ebc9e1a9bd68;hpb=afb903826904a8d9e7b3f9c7e5ab8695633ce552;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/malloc.c b/malloc.c
index 0345ef9..6a2ff15 100644
--- a/malloc.c
+++ b/malloc.c
@@ -305,7 +305,7 @@
 #     define pTHX		void
 #     define pTHX_
 #     ifdef HASATTRIBUTE
-#        define dTHX		extern int Perl___notused __attribute__ ((unused))
+#        define dTHX		extern int Perl___notused PERL_UNUSED_DECL
 #     else
 #        define dTHX            extern int Perl___notused
 #     endif
@@ -1045,7 +1045,9 @@ Perl_malloc(register size_t nbytes)
 	    POW2_OPTIMIZE_ADJUST(nbytes);
 	    nbytes += M_OVERHEAD;
 	    nbytes = (nbytes + 3) &~ 3; 
+#if defined(PACK_MALLOC) && !defined(SMALL_BUCKET_VIA_TABLE)
 	  do_shifts:
+#endif
 	    shiftr = (nbytes - 1) >> START_SHIFT;
 	    bucket = START_SHIFTS_BUCKET;
 	    /* apart from this loop, this is O(1) */