Integrate from ansi branch to mainline.

p4raw-id: //depot/perl@296

1 files changed, 3 insertions, 2 deletions

diff --git a/util.c b/util.c
index b86f6f50e2..8f515f9515 100644
--- a/util.c
+++ b/util.c
@@ -867,9 +867,9 @@ fbm_instr(unsigned char *big, register unsigned char *bigend, SV *littlestr)
 	if (!len) {
 	    if (SvTAIL(littlestr)) {
 		if (bigend > big && bigend[-1] == '\n')
-		    return bigend - 1;
+		    return (char *)(bigend - 1);
 		else
-		    return bigend;
+		    return (char *) bigend;
 	    }
 	    return (char*)big;
 	}
@@ -2547,3 +2547,4 @@ Perl_huge(void)
 }
 #endif
 
+