diff options
author | Elizabeth Mattijsen <liz@dijkmat.nl> | 2003-09-24 13:00:42 +0200 |
---|---|---|
committer | Jarkko Hietaniemi <jhi@iki.fi> | 2003-09-24 14:03:52 +0000 |
commit | 96db91ededd19121a4e50c34e859f7cb6cccfe54 (patch) | |
tree | 21d3e2adc4f4f8493c9ce896ac4a35a0e3120ed5 /ext | |
parent | 527819641c4c4feed0bb115362c22de6381e5bbb (diff) | |
download | perl-96db91ededd19121a4e50c34e859f7cb6cccfe54.tar.gz |
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..)
Diffstat (limited to 'ext')
-rw-r--r-- | ext/List/Util/Util.xs | 4 | ||||
-rw-r--r-- | ext/Time/HiRes/Makefile.PL | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/List/Util/Util.xs b/ext/List/Util/Util.xs index 98c375889c..744d8cdf94 100644 --- 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 fc6a155224..04485c76f9 100644 --- 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"; } |