sniper Thu Dec 4 07:45:32 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/standard php_string.h Log: MFH: Fix compile with c++ (bug #26519) Index: php-src/ext/standard/php_string.h diff -u php-src/ext/standard/php_string.h:1.65.2.2 php-src/ext/standard/php_string.h:1.65.2.3 --- php-src/ext/standard/php_string.h:1.65.2.2 Mon Feb 24 17:47:12 2003 +++ php-src/ext/standard/php_string.h Thu Dec 4 07:45:32 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_string.h,v 1.65.2.2 2003/02/24 22:47:12 moriyoshi Exp $ */ +/* $Id: php_string.h,v 1.65.2.3 2003/12/04 12:45:32 sniper Exp $ */ /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */ @@ -139,7 +139,7 @@ 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; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php