From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 15 Jan 2007 06:09:30 +0000 (+0200)
Subject: g++ fixes
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=aa1f7c5b6ec66b97fca8377d522bdd9e4ff098de;p=p5sagit%2Fp5-mst-13.2.git

g++ fixes
Message-Id: <20070115040930.8685843A67@anubis.hut.fi>

p4raw-id: //depot/perl@29812
---

diff --git a/op.c b/op.c
index f0f26dc..40275ab 100644
--- a/op.c
+++ b/op.c
@@ -3096,8 +3096,10 @@ Perl_pmtrans(pTHX_ OP *o, OP *expr, OP *repl)
 	    else if (j >= (I32)rlen)
 		j = rlen - 1;
 	    else {
-		tbl = PerlMemShared_realloc(tbl,
-					(0x101+rlen-j) * sizeof(short));
+		tbl = 
+		    (short *)
+		    PerlMemShared_realloc(tbl,
+					  (0x101+rlen-j) * sizeof(short));
 		cPVOPo->op_pv = (char*)tbl;
 	    }
 	    tbl[0x100] = (short)(rlen - j);
diff --git a/toke.c b/toke.c
index 57fb8a0..755f22c 100644
--- a/toke.c
+++ b/toke.c
@@ -10997,7 +10997,7 @@ S_scan_trans(pTHX_ char *start)
     }
   no_more:
 
-    tbl = PerlMemShared_calloc(complement&&!del?258:256, sizeof(short));
+    tbl = (short *)PerlMemShared_calloc(complement&&!del?258:256, sizeof(short));
     o = newPVOP(OP_TRANS, 0, (char*)tbl);
     o->op_private &= ~OPpTRANS_ALL;
     o->op_private |= del|squash|complement|