cvs: ZendEngine2 / zend_compile.c zend_constants.c
| From: | Rui Hirokawa | Date: | Sat, 25 Aug 2007 23:28:10 +0000 |
| Subject: | cvs: ZendEngine2 / zend_compile.c zend_constants.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-5976@lists.php.net to get a copy of this message | ||
hirokawa Sat Aug 25 23:28:10 2007 UTC
Modified files:
/ZendEngine2 zend_compile.c zend_constants.c
Log:
fixed compilation error on Visual C++ 2005
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.765&r2=1.766&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.765 ZendEngine2/zend_compile.c:1.766
--- ZendEngine2/zend_compile.c:1.765 Fri Aug 24 13:50:52 2007
+++ ZendEngine2/zend_compile.c Sat Aug 25 23:28:10 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.765 2007/08/24 13:50:52 dmitry Exp $ */
+/* $Id: zend_compile.c,v 1.766 2007/08/25 23:28:10 hirokawa Exp $ */
#include <zend_language_parser.h>
#include "zend.h"
@@ -1809,7 +1809,7 @@
nsname.u = u_memchr(nsname.u, ':', nsname_len) + 2;
nsname_len -= (nsname.u - Z_USTRVAL(class_node.u.constant));
} else {
- nsname.s = memchr(nsname.s, ':', nsname_len) + 2;
+ nsname.s = (char *)memchr(nsname.s, ':', nsname_len) + 2;
nsname_len -= (nsname.s - Z_STRVAL(class_node.u.constant));
}
}
@@ -3816,7 +3816,7 @@
nsname.u = u_memchr(nsname.u, ':', nsname_len) + 2;
nsname_len -= (nsname.u - Z_USTRVAL(constant_container->u.constant));
} else {
- nsname.s = memchr(nsname.s, ':', nsname_len) + 2;
+ nsname.s = (char *)memchr(nsname.s, ':', nsname_len) + 2;
nsname_len -= (nsname.s - Z_STRVAL(constant_container->u.constant));
}
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_constants.c?r1=1.98&r2=1.99&diff_format=u
Index: ZendEngine2/zend_constants.c
diff -u ZendEngine2/zend_constants.c:1.98 ZendEngine2/zend_constants.c:1.99
--- ZendEngine2/zend_constants.c:1.98 Fri Aug 24 13:50:52 2007
+++ ZendEngine2/zend_constants.c Sat Aug 25 23:28:10 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_constants.c,v 1.98 2007/08/24 13:50:52 dmitry Exp $ */
+/* $Id: zend_constants.c,v 1.99 2007/08/25 23:28:10 hirokawa Exp $ */
#include "zend.h"
#include "zend_constants.h"
@@ -409,7 +409,7 @@
nsname.u = u_memchr(nsname.u, ':', nsname_len) + 2;
nsname_len -= (nsname.u - lcname.u);
} else {
- nsname.s = memchr(nsname.s, ':', nsname_len) + 2;
+ nsname.s = (char *)memchr(nsname.s, ':', nsname_len) + 2;
nsname_len -= (nsname.s - lcname.s);
}
}