From: Nicholas Clark <nick@ccl4.org>
Date: Tue, 19 Jul 2005 22:15:43 +0000 (+0000)
Subject:        C<use Foo;> inside Foo.pm considered a "bad thing"
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=42bf33b5fc7ae0d4251da5bee07d8ce557915334;p=p5sagit%2Fp5-mst-13.2.git

   C<use Foo;> inside Foo.pm considered a "bad thing"
       (Certainly where there is AUTOLOADing and XS)
       Hopefully *this* fixes the POSIX breakage.

p4raw-id: //depot/perl@25190
---

diff --git a/ext/POSIX/POSIX.pm b/ext/POSIX/POSIX.pm
index 8e58c04..079861a 100644
--- a/ext/POSIX/POSIX.pm
+++ b/ext/POSIX/POSIX.pm
@@ -63,17 +63,20 @@ use strict;
 use Tie::Hash;
 use base qw(Tie::StdHash);
 
-use POSIX qw(sigaction SIGRTMIN SIGRTMAX SA_RESTART);
-
 use vars qw($SIGACTION_FLAGS);
 
 $SIGACTION_FLAGS = 0;
 
-my $SIGRTMIN = &SIGRTMIN;
-my $SIGRTMAX = &SIGRTMAX;
-my $sigrtn   = $SIGRTMAX - $SIGRTMIN;
+my ($SIGRTMIN, $SIGRTMAX, $sigrtn);
+
+sub _init {
+    $SIGRTMIN = &POSIX::SIGRTMIN;
+    $SIGRTMAX = &POSIX::SIGRTMAX;
+    $sigrtn   = $SIGRTMAX - $SIGRTMIN;
+}
 
 sub _croak {
+    &_init unless defined $sigrtn;
     die "POSIX::SigRt not available" unless defined $sigrtn && $sigrtn > 0;
 }
 
@@ -105,17 +108,17 @@ sub new {
     my $sigact = POSIX::SigAction->new($handler,
 				       $sigset,
 				       $flags);
-    sigaction($rtsig, $sigact);
+    POSIX::sigaction($rtsig, $sigact);
 }
 
 sub EXISTS { &_exist }
 sub FETCH  { my $rtsig = &_check;
 	     my $oa = POSIX::SigAction->new();
-	     sigaction($rtsig, undef, $oa);
+	     POSIX::sigaction($rtsig, undef, $oa);
 	     return $oa->{HANDLER} }
 sub STORE  { my $rtsig = &_check; new($rtsig, $_[2], $SIGACTION_FLAGS) }
 sub DELETE { delete $SIG{ &_check } }
-sub CLEAR  { &_exist; delete @SIG{ SIGRTMIN .. SIGRTMAX } }
+sub CLEAR  { &_exist; delete @SIG{ &POSIX::SIGRTMIN .. &POSIX::SIGRTMAX } }
 sub SCALAR { &_croak; $sigrtn + 1 }
 
 tie %POSIX::SIGRT, 'POSIX::SigRt';