From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Mon, 8 Dec 2003 08:22:17 +0000 (+0000)
Subject: Integrate change #21862 from maint-5.8 :
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=510ac311e710618e33e17a498b0d9cb4d2b69b89;p=p5sagit%2Fp5-mst-13.2.git

Integrate change #21862 from maint-5.8 :

Win32/MinGW tweaks
A. ENV_IS_CASELESS has trys to free(keysave) when
   keysave isn't in scope yet.
B. For default makefile.mk which build with perlhost.h
   stuff "live" need to link with g++ to find new/delete etc.
p4raw-link: @21862 on //depot/maint-5.8/perl: 4db40f21e8071917ddf2daa52294e1413442660d

p4raw-id: //depot/perl@21870
p4raw-integrated: from //depot/maint-5.8/perl@21869 'merge in'
	win32/makefile.mk (@21777..) hv.c (@21838..)
---

diff --git a/hv.c b/hv.c
index 4f95d1e..ab1786d 100644
--- a/hv.c
+++ b/hv.c
@@ -909,9 +909,12 @@ S_hv_delete_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
 		keysv = sv_2mortal(newSVpvn(key,klen));
 		key = strupr(SvPVX(keysv));
 
+#if 0
+		/* keysave not in scope - don't understand - NI-S */
                 if (k_flags & HVhek_FREEKEY) {
                     Safefree(keysave);
 		}
+#endif
 
 		is_utf8 = 0;
 		k_flags = 0;
diff --git a/win32/makefile.mk b/win32/makefile.mk
index b752776..894aff7 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -378,7 +378,7 @@ LINK_FLAGS	+= -L"$(CCLIBDIR)\Release"
 .ELIF "$(CCTYPE)" == "GCC"
 
 CC		= gcc
-LINK32		= gcc
+LINK32		= g++
 .IF "$(USE_GCC_V3_2)" == "define"
 LINK32		= g++
 .END