diff options
| author | Felipe Pena <felipe@php.net> | 2008-11-05 11:00:38 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-11-05 11:00:38 +0000 |
| commit | 2f26deb0e027426f79fe34db930b4787605c8f8d (patch) | |
| tree | 61c04b5dd8d77b22f8d33267c2893c3e3755e8a5 /Zend | |
| parent | 1c08ae1c8ea9fb8242a98840887c1b38d56258d4 (diff) | |
| download | php-git-2f26deb0e027426f79fe34db930b4787605c8f8d.tar.gz | |
- Fixed Windows build
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_execute_API.c | 4 | ||||
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 8e2c734091..d2f3698b42 100644 --- 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 a6b4c88415..95e1c5adfc 100644 --- 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 5b698207e4..b76b2261fc 100644 --- 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)); |