Change 33520 by [EMAIL PROTECTED] on 2008/03/13 22:43:35
Integrate:
[ 33360]
Subject: [PATCH] threads::shared 1.17
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Fri, 22 Feb 2008 16:31:02 -0500
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.10/perl/ext/threads/shared/Makefile.PL#2 integrate
... //depot/maint-5.10/perl/ext/threads/shared/shared.pm#3 integrate
... //depot/maint-5.10/perl/ext/threads/shared/shared.xs#3 integrate
... //depot/maint-5.10/perl/ext/threads/shared/t/0nothread.t#2 integrate
... //depot/maint-5.10/perl/ext/threads/shared/t/disabled.t#2 integrate
Differences ...
==== //depot/maint-5.10/perl/ext/threads/shared/Makefile.PL#2 (xtext) ====
Index: perl/ext/threads/shared/Makefile.PL
--- perl/ext/threads/shared/Makefile.PL#1~32694~ 2007-12-22
01:23:09.000000000 -0800
+++ perl/ext/threads/shared/Makefile.PL 2008-03-13 15:43:35.000000000 -0700
@@ -55,14 +55,13 @@
# Verify that a 'C' compiler is available
if (! have_cc()) {
- die("No 'C' compiler found to build 'threads'\n");
+ die("No 'C' compiler found to build 'threads::shared'\n");
}
push(@conditional_params, 'DEFINE' => '-DHAS_PPPORT_H',
'PREREQ_PM' => {
'strict' => 0,
'warnings' => 0,
- 'threads' => 0,
'Config' => 0,
'Carp' => 0,
'XSLoader' => 0,
@@ -93,4 +92,22 @@
@conditional_params
);
+# Additional 'make' targets
+sub MY::postamble
+{
+ return <<'_EXTRAS_';
+fixfiles:
+ @dos2unix `cat MANIFEST`
+ @$(CHMOD) 644 `cat MANIFEST`
+ @$(CHMOD) 755 examples/*.pl
+
+ppport:
+ @( cd /tmp; perl -e 'use Devel::PPPort;
Devel::PPPort::WriteFile("ppport.h");' )
+ @if ! cmp -s ppport.h /tmp/ppport.h; then \
+ ( tkdiff ppport.h /tmp/ppport.h & ); \
+ perl /tmp/ppport.h; \
+ fi
+_EXTRAS_
+}
+
# EOF
==== //depot/maint-5.10/perl/ext/threads/shared/shared.pm#3 (text) ====
Index: perl/ext/threads/shared/shared.pm
--- perl/ext/threads/shared/shared.pm#2~33111~ 2008-01-29 11:03:04.000000000
-0800
+++ perl/ext/threads/shared/shared.pm 2008-03-13 15:43:35.000000000 -0700
@@ -5,7 +5,7 @@
use strict;
use warnings;
-our $VERSION = '1.15';
+our $VERSION = '1.17';
my $XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
@@ -73,7 +73,7 @@
=head1 VERSION
-This document describes threads::shared version 1.15
+This document describes threads::shared version 1.17
=head1 SYNOPSIS
@@ -315,8 +315,11 @@
=head1 NOTES
-threads::shared is designed to disable itself silently if threads are not
-available. If you want access to threads, you must C<use threads> before you
+L<threads::shared> is designed to disable itself silently if threads are not
+available. This allows you to write modules and packages that can be used
+in both threaded and non-threaded applications.
+
+If you want access to threads, you must C<use threads> before you
C<use threads::shared>. L<threads> will emit a warning if you use it after
L<threads::shared>.
@@ -368,7 +371,7 @@
L<http://www.cpanforum.com/dist/threads-shared>
Annotated POD for L<threads::shared>:
-L<http://annocpan.org/~JDHEDDEN/threads-shared-1.15/shared.pm>
+L<http://annocpan.org/~JDHEDDEN/threads-shared-1.17/shared.pm>
Source repository:
L<http://code.google.com/p/threads-shared/>
==== //depot/maint-5.10/perl/ext/threads/shared/shared.xs#3 (text) ====
Index: perl/ext/threads/shared/shared.xs
--- perl/ext/threads/shared/shared.xs#2~33111~ 2008-01-29 11:03:04.000000000
-0800
+++ perl/ext/threads/shared/shared.xs 2008-03-13 15:43:35.000000000 -0700
@@ -1033,9 +1033,15 @@
* This is called when perl is about to access an element of
* the array -
*/
+#if PERL_VERSION >= 11
+int
+sharedsv_array_mg_copy(pTHX_ SV *sv, MAGIC* mg,
+ SV *nsv, const char *name, I32 namlen)
+#else
int
sharedsv_array_mg_copy(pTHX_ SV *sv, MAGIC* mg,
SV *nsv, const char *name, int namlen)
+#endif
{
MAGIC *nmg = sv_magicext(nsv,mg->mg_obj,
toLOWER(mg->mg_type),&sharedsv_elem_vtbl,
==== //depot/maint-5.10/perl/ext/threads/shared/t/0nothread.t#2 (text) ====
Index: perl/ext/threads/shared/t/0nothread.t
--- perl/ext/threads/shared/t/0nothread.t#1~32694~ 2007-12-22
01:23:09.000000000 -0800
+++ perl/ext/threads/shared/t/0nothread.t 2008-03-13 15:43:35.000000000
-0700
@@ -6,11 +6,6 @@
chdir 't';
unshift @INC, '../lib';
}
- use Config;
- if (! $Config{'useithreads'}) {
- print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
- exit(0);
- }
}
use Test::More (tests => 53);
==== //depot/maint-5.10/perl/ext/threads/shared/t/disabled.t#2 (text) ====
Index: perl/ext/threads/shared/t/disabled.t
--- perl/ext/threads/shared/t/disabled.t#1~32694~ 2007-12-22
01:23:09.000000000 -0800
+++ perl/ext/threads/shared/t/disabled.t 2008-03-13 15:43:35.000000000
-0700
@@ -6,11 +6,6 @@
chdir 't';
unshift @INC, '../lib';
}
- use Config;
- if (! $Config{'useithreads'}) {
- print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
- exit(0);
- }
}
use Test;
End of Patch.
