- Fixed Windows build

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 8e2c734091af145625b0c194090550410207ffd1..d2f3698b429c98efb8cb93cd6f233b8981241258 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -520,7 +520,7 @@ ZEND_API int zval_update_constant_ex(zval **pp, void *arg, zend_class_entry *sco
                                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 @@ ZEND_API int zval_update_constant_ex(zval **pp, void *arg, zend_class_entry *sco
                                        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;
                                        }

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index a6b4c88415de3334106b6fd4a04645e6cada40c7..95e1c5adfc3bd60f76fad77323eaabc21205c750 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2977,7 +2977,7 @@ ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT, VAR|CONST|UNUSED, CONST)
                        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));

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 5b698207e49e14f5d887fcb3622977dd04bc6955..b76b2261fc8670f30dd2f24e1abdc463abb3941c 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2732,7 +2732,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_CONST_CONST_HANDLER(ZEND_OPCO
                        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 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE
                        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 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPC
                        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));