From: Steve Hay Date: Mon, 13 Feb 2006 16:03:23 +0000 (+0000) Subject: Revert an assert() fix in the light of change #27152 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1b94edb6b76d8ada85d9ab149002ee69a7ddf8b8;p=p5sagit%2Fp5-mst-13.2.git Revert an assert() fix in the light of change #27152 The MinGW problem described here: http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2006-01/msg00146.html was fixed by change #26664. This is no longer relevant in the light of change #27152, so revert it. (The other problems with VC++ 6 and BCC, fixed by change #26634, have not gone away, however.) p4raw-link: @27152 on //depot/perl: b0e6ae5b51a7c163ac7cdb0d18b54bb1819f6c13 p4raw-link: @26664 on //depot/perl: fb9e8e97420770e8f89d9f2196e1b7b0c855e8bb p4raw-link: @26634 on //depot/perl: 834268b87a8eb670d899a13106c8dfcdfc7c9b66 p4raw-id: //depot/perl@27171 --- diff --git a/gv.h b/gv.h index 29d1bfc..250c7b9 100644 --- a/gv.h +++ b/gv.h @@ -26,11 +26,9 @@ struct gp { /* MSVC++ 6.0 (_MSC_VER == 1200) can't compile pp_hot.c with DEBUGGING enabled * if we include the following assert(). Must be a compiler bug because it - * works fine with MSVC++ 7.0. Borland (5.5.1) has the same problem. And MinGW - * (gcc-3.4.2) has a different problem when compiling win32/perllib.c! */ + * works fine with MSVC++ 7.0. Borland (5.5.1) has the same problem. */ #if defined(DEBUGGING) && \ - ((!defined(_MSC_VER) || _MSC_VER > 1200) && \ - !defined(__BORLANDC__) && !defined(__MINGW32__)) + ((!defined(_MSC_VER) || _MSC_VER > 1200) && !defined(__BORLANDC__)) # define GvGP(gv) (*(assert(SvTYPE(gv) == SVt_PVGV || \ SvTYPE(gv) == SVt_PVLV), \ &(GvXPVGV(gv)->xgv_gp)))