Change 29426 by [EMAIL PROTECTED] on 2006/11/30 14:11:57
Upgrade to Time-HiRes-1.96.
Affected files ...
... //depot/perl/ext/Time/HiRes/Changes#50 edit
... //depot/perl/ext/Time/HiRes/HiRes.pm#68 edit
... //depot/perl/ext/Time/HiRes/HiRes.xs#63 edit
... //depot/perl/ext/Time/HiRes/Makefile.PL#41 edit
Differences ...
==== //depot/perl/ext/Time/HiRes/Changes#50 (text) ====
Index: perl/ext/Time/HiRes/Changes
--- perl/ext/Time/HiRes/Changes#49~29423~ 2006-11-29 20:44:54.000000000
-0800
+++ perl/ext/Time/HiRes/Changes 2006-11-30 06:11:57.000000000 -0800
@@ -1,5 +1,9 @@
Revision history for the Perl extension Time::HiRes.
+1.96 [2006-30-11]
+ - 1.95 broke builds for threaded Perls
+ - use main() prototype consistently in Makefile.PL
+
1.95 [2006-29-11]
- integrate core change #29180: Silence VC++ compiler warnings
from Steve Hay
@@ -8,7 +12,6 @@
- regenerate fallback/*.inc for older Perls without
ExtUtils::Constant because of d_hires_stat, resolves
[rt.cpan.org #23694] Time::HiRes fails tests on Solaris and Perl 5.6.1
- - Make Makefile.PL more defensive against false PERL_CORE
1.94 [2006-10-16]
- file timestamps oddities seen: the atime and mtime
==== //depot/perl/ext/Time/HiRes/HiRes.pm#68 (text) ====
Index: perl/ext/Time/HiRes/HiRes.pm
--- perl/ext/Time/HiRes/HiRes.pm#67~29423~ 2006-11-29 20:44:54.000000000
-0800
+++ perl/ext/Time/HiRes/HiRes.pm 2006-11-30 06:11:57.000000000 -0800
@@ -23,7 +23,7 @@
stat
);
-$VERSION = '1.95';
+$VERSION = '1.96';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
==== //depot/perl/ext/Time/HiRes/HiRes.xs#63 (text) ====
Index: perl/ext/Time/HiRes/HiRes.xs
--- perl/ext/Time/HiRes/HiRes.xs#62~29180~ 2006-11-01 05:07:37.000000000
-0800
+++ perl/ext/Time/HiRes/HiRes.xs 2006-11-30 06:11:57.000000000 -0800
@@ -1213,16 +1213,18 @@
stat(...)
PROTOTYPE: ;$
PPCODE:
+ dTHX;
PUSHMARK(SP);
XPUSHs(sv_2mortal(newSVsv(items == 1 ? ST(0) : DEFSV)));
PUTBACK;
ENTER;
PL_laststatval = -1;
- (void)*(PL_ppaddr[OP_STAT])(aTHX);
+ pp_stat();
SPAGAIN;
LEAVE;
if (PL_laststatval == 0) {
- /* We assume that pp_stat() left us with 13 valid stack items. */
+ /* We assume that pp_stat() left us with 13 valid stack items,
+ * and that the timestamps are at offsets 8, 9, and 10. */
UV atime = SvUV(ST( 8));
UV mtime = SvUV(ST( 9));
UV ctime = SvUV(ST(10));
==== //depot/perl/ext/Time/HiRes/Makefile.PL#41 (text) ====
Index: perl/ext/Time/HiRes/Makefile.PL
--- perl/ext/Time/HiRes/Makefile.PL#40~29423~ 2006-11-29 20:44:54.000000000
-0800
+++ perl/ext/Time/HiRes/Makefile.PL 2006-11-30 06:11:57.000000000 -0800
@@ -102,15 +102,6 @@
$COREincdir = File::Spec->catdir($Config{'archlibexp'}, 'CORE');
}
- if ($ENV{PERL_CORE}) {
- unless (-f File::Spec->catfile($COREincdir, "EXTERN.h")) {
- die <<__EOD__;
-Your \$ENV{PERL_CORE} is $ENV{PERL_CORE} but there is no EXTERN.h in
-$COREincdir. Cannot continue, aborting.
-__EOD__
- }
- }
-
my $ccflags = $Config{'ccflags'} . ' ' . "-I$COREincdir";
if ($^O eq 'VMS') {
@@ -252,7 +243,7 @@
/* int nanosleep(const struct timespec *rqtp, struct timespec *rmtp); */
-int main() {
+int main _((int argc, char** argv, char** env)) {
struct timespec ts1, ts2;
int ret;
ts1.tv_sec = 0;
@@ -605,7 +596,7 @@
if (try_compile_and_link(<<EOM)) {
$TIME_HEADERS
#include <sys/stat.h>
-int main() {
+int main _((int argc, char** argv, char** env)) {
struct stat st;
st.st_atimespec.tv_nsec = 0;
}
@@ -625,7 +616,7 @@
if (try_compile_and_link(<<EOM)) {
$TIME_HEADERS
#include <sys/stat.h>
-int main() {
+int main _((int argc, char** argv, char** env)) {
struct stat st;
st.st_atimensec = 0;
}
@@ -645,7 +636,7 @@
if (try_compile_and_link(<<EOM)) {
$TIME_HEADERS
#include <sys/stat.h>
-int main() {
+int main _((int argc, char** argv, char** env)) {
struct stat st;
st.st_atime_n = 0;
}
@@ -665,7 +656,7 @@
if (try_compile_and_link(<<EOM)) {
$TIME_HEADERS
#include <sys/stat.h>
-int main() {
+int main _((int argc, char** argv, char** env)) {
struct stat st;
st.st_atim.tv_nsec = 0;
}
@@ -685,7 +676,7 @@
if (try_compile_and_link(<<EOM)) {
$TIME_HEADERS
#include <sys/stat.h>
-int main() {
+int main _((int argc, char** argv, char** env)) {
struct stat st;
st.st_uatime = 0;
}
@@ -844,7 +835,6 @@
Makefile:91: *** missing separator
then set the environment variable LC_ALL to "C" and retry
from scratch (re-run perl "Makefile.PL").
-(And consider upgrading your Perl.)
EOM
}
}
End of Patch.
