Integrate changes #9493,9494,9495,9496 from maintperl

into mainline.

fix a broken workaround for Borland compiler in change#4739
(caused weird "short reads" on DATA, which caused op/misc.t to fail)

nits spotted by Borland compiler

avoid redefinition warnings under Borland 5.02

various nits identified by the Borland 5.5 compiler; remove suppression
of a few warnings

p4raw-link: @9496 on //depot/maint-5.6/perl: 9d05ad52b0aa7d1f7d147da0c4dbc14de5fe4a37
p4raw-link: @9495 on //depot/maint-5.6/perl: 759997f1e719f33541bed70dd7f79bfa26a930b3
p4raw-link: @9494 on //depot/maint-5.6/perl: 01b59bde1cb7ff62776f3b83c0f2575c79a950a6
p4raw-link: @9493 on //depot/maint-5.6/perl: eea7051a8d4ef81c032143ab3193bc1240ab2e8f
p4raw-link: @4739 on //depot/perl: c39cd00800303e8967294e98aa4c427a1872a251

p4raw-id: //depot/perl@9497
p4raw-integrated: from //depot/maint-5.6/perl@9492 'merge in' sv.c
	utf8.h (@9288..) toke.c (@9292..) ext/File/Glob/bsd_glob.c
	(@9415..) win32/makefile.mk (@9426..) win32/win32.h (@9494..)

1 files changed, 5 insertions, 5 deletions

diff --git a/sv.c b/sv.c
index 704718e23b..e91f1d9b6f 100644
--- a/sv.c
+++ b/sv.c
@@ -7680,8 +7680,8 @@ Perl_gp_dup(pTHX_ GP *gp)
 MAGIC *
 Perl_mg_dup(pTHX_ MAGIC *mg)
 {
-    MAGIC *mgret = (MAGIC*)NULL;
-    MAGIC *mgprev;
+    MAGIC *mgprev = (MAGIC*)NULL;
+    MAGIC *mgret;
     if (!mg)
 	return (MAGIC*)NULL;
     /* look for it in the table first */
@@ -7692,10 +7692,10 @@ Perl_mg_dup(pTHX_ MAGIC *mg)
     for (; mg; mg = mg->mg_moremagic) {
 	MAGIC *nmg;
 	Newz(0, nmg, 1, MAGIC);
-	if (!mgret)
-	    mgret = nmg;
-	else
+	if (mgprev)
 	    mgprev->mg_moremagic = nmg;
+	else
+	    mgret = nmg;
 	nmg->mg_virtual	= mg->mg_virtual;	/* XXX copy dynamic vtable? */
 	nmg->mg_private	= mg->mg_private;
 	nmg->mg_type	= mg->mg_type;