X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=util.c;h=fc8307d52c354f2fc220a572d2230b57623707c6;hb=cc49e20bd7575d1d37e92731860d63daa4d52ecc;hp=f78ad04820052c2a694b102e837a88967c7be298;hpb=7b0972df8f5014603934d3178907bf5277318161;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/util.c b/util.c
index f78ad04..fc8307d 100644
--- a/util.c
+++ b/util.c
@@ -1418,7 +1418,7 @@ Perl_vmess(pTHX_ const char *pat, va_list *args)
 	dTHR;
 	if (PL_curcop->cop_line)
 	    Perl_sv_catpvf(aTHX_ sv, " at %_ line %"IVdf,
-		      GvSV(PL_curcop->cop_filegv), (IV)PL_curcop->cop_line);
+			   CopFILESV(PL_curcop), (IV)PL_curcop->cop_line);
 	if (GvIO(PL_last_in_gv) && IoLINES(GvIOp(PL_last_in_gv))) {
 	    bool line_mode = (RsSIMPLE(PL_rs) &&
 			      SvCUR(PL_rs) == 1 && *SvPVX(PL_rs) == '\n');
@@ -1555,8 +1555,8 @@ Perl_vcroak(pTHX_ const char* pat, va_list *args)
     else
 	message = SvPV(msv,msglen);
 
-    DEBUG_S(PerlIO_printf(Perl_debug_log, "croak: 0x%lx %s",
-			  (unsigned long) thr, message));
+    DEBUG_S(PerlIO_printf(Perl_debug_log, "croak: 0x%"UVxf" %s",
+			  PTR2UV(thr), message));
 
     if (PL_diehook) {
 	/* sv_2cv might call Perl_croak() */
@@ -1742,7 +1742,7 @@ Perl_vwarner(pTHX_ U32  err, const char* pat, va_list* args)
 
     if (ckDEAD(err)) {
 #ifdef USE_THREADS
-        DEBUG_S(PerlIO_printf(Perl_debug_log, "croak: 0x%lx %s", (unsigned long) thr, message));
+        DEBUG_S(PerlIO_printf(Perl_debug_log, "croak: 0x%"UVxf" %s", PTR2UV(thr), message));
 #endif /* USE_THREADS */
         if (PL_diehook) {
             /* sv_2cv might call Perl_croak() */