Integrate:

[ 21353]
Someone actually reads the Makefile.PL messages, it seems.
(from Jonathan Leffler)

[ 21354]
A fix from Graham for
[perl #24012] Weird conversion issue with List::Util::sum on Linux/AMD 850MHz
(seemingly a NV casting issue)

[ 21356]
Subject: [DOCPATCH] attributes.pm
Message-Id: <p05111b02bb970d5eec89@[192.168.56.4]>

(reformatted a bit)
p4raw-link: @21356 on //depot/perl: cef7f6212e02689c2aa27d0d7dc8e6afd7f665e8
p4raw-link: @21354 on //depot/perl: b9ae0a2d3e1516a6a8b6fdb9d5354ef5912780c3
p4raw-link: @21353 on //depot/perl: 477413c82d4216edf78e75357a2438a3497c8216

p4raw-id: //depot/maint-5.8/perl@21359
p4raw-integrated: from //depot/perl@21358 'copy in' lib/attributes.pm
	(@20688..) ext/List/Util/Util.xs (@20700..)
	ext/Time/HiRes/Makefile.PL (@20794..)

diff --git a/ext/List/Util/Util.xs b/ext/List/Util/Util.xs
index 98c3758..744d8cd 100644 (file)
--- a/ext/List/Util/Util.xs
+++ b/ext/List/Util/Util.xs
@@ -47,9 +47,9 @@ my_cxinc(pTHX)
 #endif
 
 #ifdef SVf_IVisUV
-#  define slu_sv_value(sv) (NV)(SvIOK(sv) ? SvIOK_UV(sv) ? SvUVX(sv) : SvIVX(sv) : SvNV(sv))
+#  define slu_sv_value(sv) (SvIOK(sv)) ? (SvIOK_UV(sv)) ? (NV)(SvUVX(sv)) : (NV)(SvIVX(sv)) : (SvNV(sv))
 #else
-#  define slu_sv_value(sv) (NV)(SvIOK(sv) ? SvIVX(sv) : SvNV(sv))
+#  define slu_sv_value(sv) (SvIOK(sv)) ? (NV)(SvIVX(sv)) : SvNV(sv)
 #endif
 
 #ifndef Drand01

diff --git a/ext/Time/HiRes/Makefile.PL b/ext/Time/HiRes/Makefile.PL
index fc6a155..04485c7 100644 (file)
--- a/ext/Time/HiRes/Makefile.PL
+++ b/ext/Time/HiRes/Makefile.PL
@@ -284,7 +284,7 @@ EOD
     }
 
     if ($has_setitimer && $has_getitimer) {
-       print "You have interval timers (both setitimer and setitimer).\n";
+       print "You have interval timers (both setitimer and getitimer).\n";
     } else {
        print "You do not have interval timers.\n";
     }

diff --git a/lib/attributes.pm b/lib/attributes.pm
index dfe892a..714cb26 100644 (file)
--- a/lib/attributes.pm
+++ b/lib/attributes.pm
@@ -165,6 +165,10 @@ The following are the built-in attributes for subroutines:
 
 =item locked
 
+B<5.005 threads only!  The use of the "locked" attribute currently
+only makes sense if you are using the deprecated "Perl 5.005 threads"
+implementation of threads.>
+
 Setting this attribute is only meaningful when the subroutine or
 method is to be called by multiple threads.  When set on a method
 subroutine (i.e., one marked with the B<method> attribute below),