From: Gurusamy Sarathy <gsar@cpan.org>
Date: Fri, 14 Jul 2000 11:23:41 +0000 (+0000)
Subject: inconsistent types needs casts
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b8f84bb27684a1023e7cee5fba1de7771ea9abfb;p=p5sagit%2Fp5-mst-13.2.git

inconsistent types needs casts

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

diff --git a/toke.c b/toke.c
index 199400e..e47853e 100644
--- a/toke.c
+++ b/toke.c
@@ -2545,7 +2545,7 @@ Perl_yylex(pTHX)
 		}
 	    } 
 	    if (bof)
-		s = swallow_bom(s);
+		s = swallow_bom((U8*)s);
 	    incline(s);
 	} while (PL_doextract);
 	PL_oldoldbufptr = PL_oldbufptr = PL_bufptr = PL_linestart = s;
@@ -7424,7 +7424,8 @@ S_swallow_bom(pTHX_ U8 *s)
 	    s += 2;
 	    filter_add(S_utf16rev_textfilter, NULL);
 	    New(898, news, (PL_bufend - (char*)s) * 3 / 2 + 1, U8);
-	    PL_bufend = utf16_to_utf8((U16*)s, news, PL_bufend - (char*)s);
+	    PL_bufend = (char*)utf16_to_utf8((U16*)s, news,
+					     PL_bufend - (char*)s);
 	    s = news;
 #else
 	    Perl_croak(aTHX_ "Unsupported script encoding");
@@ -7437,7 +7438,8 @@ S_swallow_bom(pTHX_ U8 *s)
 	    U8 *news;
 	    filter_add(S_utf16_textfilter, NULL);
 	    New(898, news, (PL_bufend - (char*)s) * 3 / 2 + 1, U8);
-	    PL_bufend = utf16_to_utf8((U16*)s, news, PL_bufend - (char*)s);
+	    PL_bufend = (char*)utf16_to_utf8((U16*)s, news,
+					     PL_bufend - (char*)s);
 	    s = news;
 #else
 	    Perl_croak(aTHX_ "Unsupported script encoding");
@@ -7456,7 +7458,7 @@ S_swallow_bom(pTHX_ U8 *s)
 	    Perl_croak(aTHX_ "Unsupported script encoding");
 	}
     }
-    return s;
+    return (char*)s;
 }
 
 #ifdef PERL_OBJECT