From: foobar <sniper@php.net>
Date: Thu, 4 Dec 2003 12:45:32 +0000 (+0000)
Subject: MFH: Fix compile with c++ (bug #26519)
X-Git-Tag: php-4.3.5RC1~116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c4361d2f183a80d9370db85f08b015b34070ad7;p=php

MFH: Fix compile with c++ (bug #26519)
---

diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h
index b2d146c056..51f8fdc782 100644
--- a/ext/standard/php_string.h
+++ b/ext/standard/php_string.h
@@ -139,7 +139,7 @@ php_memnstr(char *haystack, char *needle, int needle_len, char *end)
 	end -= needle_len;
 
 	while (p <= end) {
-		if ((p = memchr(p, *needle, (end-p+1))) && ne == p[needle_len-1]) {
+		if ((p = (char *) memchr(p, *needle, (end-p+1))) && ne == p[needle_len-1]) {
 			if (!memcmp(needle, p, needle_len-1)) {
 				return p;
 			}