Change 20132 by [EMAIL PROTECTED] on 2003/07/10 22:46:30
Integrate:
[ 20129]
Subject: [comment patch]
From: Stas Bekman <[EMAIL PROTECTED]>
Date: Thu, 10 Jul 2003 14:19:22 -0700
Message-ID: <[EMAIL PROTECTED]>
[ 20130]
Subject: [PATCH} db-recno.t on Mac OS X
From: [EMAIL PROTECTED]
Date: Thu, 10 Jul 2003 12:41:05 +0000
Message-Id: <[EMAIL PROTECTED]>
[ 20131]
&Time::HiRes::d_nanosleep was broken.
Affected files ...
... //depot/maint-5.8/perl/ext/DB_File/t/db-recno.t#4 integrate
... //depot/maint-5.8/perl/ext/Time/HiRes/Makefile.PL#18 integrate
... //depot/maint-5.8/perl/perl.c#44 integrate
Differences ...
==== //depot/maint-5.8/perl/ext/DB_File/t/db-recno.t#4 (xtext) ====
Index: perl/ext/DB_File/t/db-recno.t
--- perl/ext/DB_File/t/db-recno.t#3~18131~ Sat Nov 9 13:28:07 2002
+++ perl/ext/DB_File/t/db-recno.t Thu Jul 10 15:46:30 2003
@@ -104,7 +104,7 @@
print STDERR <<EOM ;
#
# Some older versions of Berkeley DB version 1 will fail db-recno
-# tests 61, 63 and 65.
+# tests 61, 63, 64, and 65.
EOM
if ($^O eq 'darwin'
&& $Config{db_version_major} == 1
==== //depot/maint-5.8/perl/ext/Time/HiRes/Makefile.PL#18 (text) ====
Index: perl/ext/Time/HiRes/Makefile.PL
--- perl/ext/Time/HiRes/Makefile.PL#17~20067~ Mon Jul 7 22:39:14 2003
+++ perl/ext/Time/HiRes/Makefile.PL Thu Jul 10 15:46:30 2003
@@ -404,7 +404,11 @@
foreach (qw (d_usleep d_ualarm d_gettimeofday d_getitimer d_setitimer
d_nanosleep)) {
my $macro = $_;
- $macro =~ s/d_(.*)/HAS_\U$1/;
+ if ($macro eq 'd_nanosleep') {
+ $macro =~ s/d_(.*)/TIME_HIRES_\U$1/;
+ } else {
+ $macro =~ s/d_(.*)/HAS_\U$1/;
+ }
push @names, {name => $_, macro => $macro, value => 1,
default => ["IV", "0"]};
}
==== //depot/maint-5.8/perl/perl.c#44 (text) ====
Index: perl/perl.c
--- perl/perl.c#43~20122~ Thu Jul 10 11:06:05 2003
+++ perl/perl.c Thu Jul 10 15:46:30 2003
@@ -1055,7 +1055,7 @@
(UV)(Drand01() * (NV)((1 << ((UVSIZE * 8 - RANDBITS))) - 1));
#endif /* RANDBITS < (UVSIZE * 8) */
}
-#endif /* USE_HASH_SEED_EXPLICIT */
+#endif /* #ifndef USE_HASH_SEED_EXPLICIT */
if ((s = PerlEnv_getenv("PERL_HASH_SEED_DEBUG")))
PerlIO_printf(Perl_debug_log, "HASH_SEED = %"UVuf"\n",
PL_hash_seed);
End of Patch.
