diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-02-21 20:12:43 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-02-21 20:12:43 +0000 |
| commit | 0f1209ab3d1f9ec0f1ea7295fa987ba4dea270c8 (patch) | |
| tree | f599e4188e236ccf04fa0f74518e6c10bbcb5d14 /Zend/zend_objects.c | |
| parent | fca6eecbe944effb6374e63271a008947b266e64 (diff) | |
| download | php-git-0f1209ab3d1f9ec0f1ea7295fa987ba4dea270c8.tar.gz | |
Portable unicode string API:
- use the same type (int) for zval.value.usr.len and zval.value.str.len
- use union "zstr" as char*/UChar* mixture instead of void*
- Z_UNISTR() and Z_UNILEN() no longer check for Z_TYPE()
- nuke int32_t from ZE (not finisned)
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 0e5e27b6d9..1d10f57e85 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -44,7 +44,7 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl zend_error(EG(in_execution) ? E_ERROR : E_WARNING, "Call to private %v::__destruct() from context '%v'%s", ce->name, - EG(scope) ? EG(scope)->name : (char*)EMPTY_STR, + EG(scope) ? EG(scope)->name : (zstr)EMPTY_STR, EG(in_execution) ? "" : " during shutdown ignored"); return; } @@ -57,7 +57,7 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl zend_error(EG(in_execution) ? E_ERROR : E_WARNING, "Call to protected %v::__destruct() from context '%v'%s", ce->name, - EG(scope) ? EG(scope)->name : (char*)EMPTY_STR, + EG(scope) ? EG(scope)->name : (zstr)EMPTY_STR, EG(in_execution) ? "" : " during shutdown ignored"); return; } |