cvs: ZendEngine2(PHP_5_3) / zend_execute_API.c zend_vm_def.h zend_vm_execute.h
[email protected] ("Felipe Pena")
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsfelipe1225882843@cvsserver> |
felipe Wed Nov 5 11:00:43 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_execute_API.c zend_vm_def.h zend_vm_execute.h
Log:
- Fixed Windows build
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.61&r2=1.331.2.20.2.24.2.62&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.61 ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.62
--- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.61 Tue Nov 4 15:58:50 2008
+++ ZendEngine2/zend_execute_API.c Wed Nov 5 11:00:37 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.61 2008/11/04 15:58:50 helly Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.62 2008/11/05 11:00:37 felipe Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -520,7 +520,7 @@
char *save = actual;
int actual_len = Z_STRLEN_P(p);
if (Z_TYPE_P(p) & IS_CONSTANT_RT_NS_CHECK) {
- actual = zend_memrchr(actual, '\\', actual_len) + 1;
+ actual = (char *)zend_memrchr(actual, '\\', actual_len) + 1;
actual_len -= (actual - Z_STRVAL_P(p));
if (inline_change) {
actual = estrndup(actual, actual_len);
@@ -613,7 +613,7 @@
str_index = colon;
} else {
if (str_index[str_index_len - 2] & IS_CONSTANT_RT_NS_CHECK) {
- actual = zend_memrchr(str_index, '\\', str_index_len - 3) + 1;
+ actual = (char *)zend_memrchr(str_index, '\\', str_index_len - 3) + 1;
str_index_len -= (actual - str_index);
str_index = actual;
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.59.2.29.2.48.2.72&r2=1.59.2.29.2.48.2.73&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.72 ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.73
--- ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.72 Tue Nov 4 15:58:51 2008
+++ ZendEngine2/zend_vm_def.h Wed Nov 5 11:00:38 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.72 2008/11/04 15:58:51 helly Exp $ */
+/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.73 2008/11/05 11:00:38 felipe Exp $ */
/* If you change this file, please regenerate the zend_vm_execute.h and
* zend_vm_opcodes.h files by running:
@@ -2977,7 +2977,7 @@
char *actual = Z_STRVAL(opline->op2.u.constant);
if (opline->extended_value & IS_CONSTANT_RT_NS_CHECK) {
- actual = zend_memrchr(actual, '\\', Z_STRLEN(opline->op2.u.constant)) + 1;
+ actual = (char *)zend_memrchr(actual, '\\', Z_STRLEN(opline->op2.u.constant)) + 1;
Z_STRLEN(opline->op2.u.constant) -= (actual - Z_STRVAL(opline->op2.u.constant));
actual = estrndup(actual, Z_STRLEN(opline->op2.u.constant));
efree(Z_STRVAL(opline->op2.u.constant));
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.62.2.30.2.49.2.72&r2=1.62.2.30.2.49.2.73&diff_format=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.72 ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.73
--- ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.72 Tue Nov 4 15:58:51 2008
+++ ZendEngine2/zend_vm_execute.h Wed Nov 5 11:00:38 2008
@@ -2732,7 +2732,7 @@
char *actual = Z_STRVAL(opline->op2.u.constant);
if (opline->extended_value & IS_CONSTANT_RT_NS_CHECK) {
- actual = zend_memrchr(actual, '\\', Z_STRLEN(opline->op2.u.constant)) + 1;
+ actual = (char *)zend_memrchr(actual, '\\', Z_STRLEN(opline->op2.u.constant)) + 1;
Z_STRLEN(opline->op2.u.constant) -= (actual - Z_STRVAL(opline->op2.u.constant));
actual = estrndup(actual, Z_STRLEN(opline->op2.u.constant));
efree(Z_STRVAL(opline->op2.u.constant));
@@ -10442,7 +10442,7 @@
char *actual = Z_STRVAL(opline->op2.u.constant);
if (opline->extended_value & IS_CONSTANT_RT_NS_CHECK) {
- actual = zend_memrchr(actual, '\\', Z_STRLEN(opline->op2.u.constant)) + 1;
+ actual = (char *)zend_memrchr(actual, '\\', Z_STRLEN(opline->op2.u.constant)) + 1;
Z_STRLEN(opline->op2.u.constant) -= (actual - Z_STRVAL(opline->op2.u.constant));
actual = estrndup(actual, Z_STRLEN(opline->op2.u.constant));
efree(Z_STRVAL(opline->op2.u.constant));
@@ -17789,7 +17789,7 @@
char *actual = Z_STRVAL(opline->op2.u.constant);
if (opline->extended_value & IS_CONSTANT_RT_NS_CHECK) {
- actual = zend_memrchr(actual, '\\', Z_STRLEN(opline->op2.u.constant)) + 1;
+ actual = (char *)zend_memrchr(actual, '\\', Z_STRLEN(opline->op2.u.constant)) + 1;
Z_STRLEN(opline->op2.u.constant) -= (actual - Z_STRVAL(opline->op2.u.constant));
actual = estrndup(actual, Z_STRLEN(opline->op2.u.constant));
efree(Z_STRVAL(opline->op2.u.constant));