diff options
| author | Mark Spruiell <mes@zeroc.com> | 2011-12-29 16:26:58 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2011-12-29 16:26:58 -0800 |
| commit | d9996d556b399ca993f6b834fbf3b991f605afae (patch) | |
| tree | 9a704f3b7cecfff2695c6257273cb19d953120aa /php/src/IcePHP/Logger.cpp | |
| parent | ICE-3441 - Compute serialVersionUID (diff) | |
| download | ice-d9996d556b399ca993f6b834fbf3b991f605afae.tar.bz2 ice-d9996d556b399ca993f6b834fbf3b991f605afae.tar.xz ice-d9996d556b399ca993f6b834fbf3b991f605afae.zip | |
ICE-4764 - PHP 5.4 compatibility
Diffstat (limited to 'php/src/IcePHP/Logger.cpp')
| -rw-r--r-- | php/src/IcePHP/Logger.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/php/src/IcePHP/Logger.cpp b/php/src/IcePHP/Logger.cpp index f9514a32b7b..e6d52d0b7de 100644 --- a/php/src/IcePHP/Logger.cpp +++ b/php/src/IcePHP/Logger.cpp @@ -210,7 +210,8 @@ handleFreeStorage(void* p TSRMLS_DC) { Wrapper<Ice::LoggerPtr>* obj = static_cast<Wrapper<Ice::LoggerPtr>*>(p); delete obj->ptr; - zend_objects_free_object_storage(static_cast<zend_object*>(p) TSRMLS_CC); + zend_object_std_dtor(static_cast<zend_object*>(p) TSRMLS_CC); + efree(p); } #ifdef _WIN32 @@ -226,11 +227,11 @@ handleClone(zval* zv TSRMLS_DC) // // Predefined methods for Logger. // -static function_entry _interfaceMethods[] = +static zend_function_entry _interfaceMethods[] = { {0, 0, 0} }; -static function_entry _classMethods[] = +static zend_function_entry _classMethods[] = { ZEND_ME(Ice_Logger, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) ZEND_ME(Ice_Logger, __toString, NULL, ZEND_ACC_PUBLIC) |