X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FThread.pm;h=fc39769002729234e35ac03dcd662ccab45e6725;hb=6bcc4512882cbfb9a802c28116e3f7a01455c5f8;hp=3aa6162de08a6e252bf4f8795455f884029584e5;hpb=4cf4ea458eb1811161558c203d03964bd34808ab;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/Thread.pm b/lib/Thread.pm
index 3aa6162..fc39769 100644
--- a/lib/Thread.pm
+++ b/lib/Thread.pm
@@ -313,6 +313,10 @@ sub unimplement {
 
 BEGIN {
     if ($ithreads) {
+	if ($othreads) {
+	    require Carp;
+	    Carp::croak("This Perl has both ithreads and 5005threads (serious malconfiguration)");
+	}
 	XSLoader::load 'threads';
 	for my $m (qw(new join detach yield self tid equal)) {
 	    no strict 'refs';
@@ -330,7 +334,7 @@ BEGIN {
 	unimplement(qw(unlock));
     } else {
 	require Carp;
-	Carp::croak("This Perl has neither ithreads not 5005threads");
+	Carp::croak("This Perl has neither ithreads nor 5005threads");
     }
 }