Integrate:

[ 33629]
Fix bug in change 33379 - if we're using malloc_size() as well as being
careful to work with PERL_TRACK_MEMPOOL, we also have to be careful to
work *without* it.

[ 33632]
In Perl_sv_grow(), no need to do PERL_STRLEN_ROUNDUP() if we have
malloc_size() to get the true allocated space, as PERL_STRLEN_ROUNDUP()
might actually bump the request across an allocation size boundary.

[ 33639]
Clean up some compiler warnings spotted by smokers.

[ 33644]
From: "Jan Dubois" <jand@activestate.com>
Subject: [PATCH] PL_bincompat_opt should be exported on AIX and Windows
Date: Thu, 3 Apr 2008 17:34:13 -0700
Message-ID: <02c001c895eb$9bc3e920$d34bbb60$@com>

(with one tweak--it should be PL_bincompat_options!)

[ 33650]
Subject: [PATCH] perlfunc.pod: atan2(0,0) returns 0, not undef
From: Paul Fenwick <pjf@perltraining.com.au>
Date: Sun, 06 Apr 2008 11:28:27 +1000
Message-ID: <47F8273B.6010504@perltraining.com.au>

[ 33653]
Replace all remaining accesses to COP's cop_label with CopLABEL().

[ 33676]
Make atan2(0,0) return undef

[ 33678]
Revert change #33676, likely to break atan(-0,0) on some platforms
p4raw-link: @33678 on //depot/perl: a1021d57870f2cf967a704182b47a5defa79a0f1
p4raw-link: @33676 on //depot/perl: 9d6bff35783dc768c5d72663e6e2d31769c5da91
p4raw-link: @33653 on //depot/perl: 4b65a9196162b345e7cbe8a43eca838c2e79e41b
p4raw-link: @33650 on //depot/perl: 9f5e10ca92116e50ba77fee2d7f4b85b0cfe80e9
p4raw-link: @33644 on //depot/perl: 8aef763e1786688c418bf91b2b95264d08196549
p4raw-link: @33639 on //depot/perl: 63da68370303e866ac043996a57db4b7e44b7270
p4raw-link: @33632 on //depot/perl: aedff202e428171aca34f30e105f7d4462b85de2
p4raw-link: @33629 on //depot/perl: e82be400b1a05af41d9d7f8509dfe352c4f1c75f

p4raw-id: //depot/maint-5.10/perl@33946
p4raw-integrated: from //depot/perl@33945 'merge in' dump.c (@33584..)
p4raw-integrated: from //depot/perl@33676 'edit in' pp.c (@33618..)
	'ignore' t/op/exp.t (@24388..)
p4raw-integrated: from //depot/perl@33653 'copy in' ext/B/B.pm
	(@33230..) 'merge in' ext/B/B.xs (@33315..) pp_ctl.c (@33580..)
p4raw-integrated: from //depot/perl@33650 'edit in' pod/perlfunc.pod
	(@33558..)
p4raw-integrated: from //depot/perl@33644 'copy in' globvar.sym
	(@32116..)
p4raw-integrated: from //depot/perl@33639 'merge in' pp_sys.c
	(@33343..) perl.c (@33595..)
p4raw-integrated: from //depot/perl@33632 'merge in' sv.c (@33627..)
p4raw-integrated: from //depot/perl@33629 'merge in' perl.h (@33598..)

1 files changed, 13 insertions, 5 deletions

diff --git a/perl.h b/perl.h
index 78893a8fbb..03272b2c12 100644
--- a/perl.h
+++ b/perl.h
@@ -4070,17 +4070,25 @@ struct perl_memory_debug_header {
 #ifdef MYMALLOC
 #  define Perl_safesysmalloc_size(where)	Perl_malloced_size(where)
 #else
-#   ifdef HAS_MALLOC_SIZE
+#  ifdef HAS_MALLOC_SIZE
+#    ifdef PERL_TRACK_MEMPOOL
 #	define Perl_safesysmalloc_size(where)			\
 	    (malloc_size(((char *)(where)) - sTHX) - sTHX)
-#   endif
-#   ifdef HAS_MALLOC_GOOD_SIZE
+#    else
+#	define Perl_safesysmalloc_size(where) malloc_size(where)
+#    endif
+#  endif
+#  ifdef HAS_MALLOC_GOOD_SIZE
+#    ifdef PERL_TRACK_MEMPOOL
 #	define Perl_malloc_good_size(how_much)			\
 	    (malloc_good_size((how_much) + sTHX) - sTHX)
-#   else
+#    else
+#	define Perl_malloc_good_size(how_much) malloc_good_size(how_much)
+#    endif
+#  else
 /* Having this as the identity operation makes some code simpler.  */
 #	define Perl_malloc_good_size(how_much)	(how_much)
-#   endif
+#  endif
 #endif
 
 typedef int (CPERLscope(*runops_proc_t)) (pTHX);