Don't preload Carp::Heavy in warnings.pm

Use only Carp, now that all the machinery is in it.

diff --git a/lib/warnings.pm b/lib/warnings.pm
index fb8c02a..a42b662 100644 (file)
--- a/lib/warnings.pm
+++ b/lib/warnings.pm
@@ -302,7 +302,7 @@ $All = "" ; vec($All, $Offsets{'all'}, 2) = 3 ;
 
 sub Croaker
 {
-    require Carp::Heavy; # this initializes %CarpInternal
+    require Carp; # this initializes %CarpInternal
     local $Carp::CarpInternal{'warnings'};
     delete $Carp::CarpInternal{'warnings'};
     Carp::croak(@_);
@@ -453,7 +453,7 @@ sub __chk
 }
 
 sub _error_loc {
-    require Carp::Heavy;
+    require Carp;
     goto &Carp::short_error_loc; # don't introduce another stack frame
 }                                                             
 

diff --git a/warnings.pl b/warnings.pl
index c5cdaa8..4d010de 100644 (file)
--- a/warnings.pl
+++ b/warnings.pl
@@ -587,7 +587,7 @@ $All = "" ; vec($All, $Offsets{'all'}, 2) = 3 ;
 
 sub Croaker
 {
-    require Carp::Heavy; # this initializes %CarpInternal
+    require Carp; # this initializes %CarpInternal
     local $Carp::CarpInternal{'warnings'};
     delete $Carp::CarpInternal{'warnings'};
     Carp::croak(@_);
@@ -738,7 +738,7 @@ sub __chk
 }
 
 sub _error_loc {
-    require Carp::Heavy;
+    require Carp;
     goto &Carp::short_error_loc; # don't introduce another stack frame
 }