cvs: php4 /ext/standard php_string.h
| From: | Stephen van Egmond | Date: | Sat, 17 Mar 2001 20:35:38 +0000 |
| Subject: | cvs: php4 /ext/standard php_string.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-4628@lists.php.net to get a copy of this message | ||
svanegmond Sat Mar 17 12:35:38 2001 EDT
Modified files:
/php4/ext/standard php_string.h
Log:
fixed a (C++) warning about implicit conversion from void*
Index: php4/ext/standard/php_string.h
diff -u php4/ext/standard/php_string.h:1.36 php4/ext/standard/php_string.h:1.37
--- php4/ext/standard/php_string.h:1.36 Sun Feb 25 22:07:23 2001
+++ php4/ext/standard/php_string.h Sat Mar 17 12:35:38 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_string.h,v 1.36 2001/02/26 06:07:23 andi Exp $ */
+/* $Id: php_string.h,v 1.37 2001/03/17 20:35:38 svanegmond Exp $ */
/* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
@@ -122,7 +122,7 @@
char *s = NULL;
for(; p <= end - needle_len &&
- (s = memchr(p, *needle, end - p - needle_len + 1)); p = s + 1) {
+ (s = (char*)memchr(p, *needle, end - p - needle_len + 1)); p = s + 1) {
if(memcmp(s, needle, needle_len) == 0)
return s;
}