2 files changed, 4 insertions, 1 deletions
diff --git a/hv.c b/hv.c
index 4f95d1ee98..ab1786d77b 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 b75277695f..894aff7d6d 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