hack PHP_5_4 compatibility into v1

[m6w6/ext-http] / php_http_std_defs.h

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 1b08ffdd4c7dbf2e90297cb4d5c5da5dd0566b72..32c12333ae0062cdfad3867867735f051c647daf 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -182,7 +182,11 @@ typedef int STATUS;
 #      define getObject(t, o) getObjectEx(t, o, getThis())
 #      define getObjectEx(t, o, v) t * o = ((t *) zend_object_store_get_object(v TSRMLS_CC))
 #      define putObject(t, o) zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) _ ##t## _free, NULL TSRMLS_CC);
-#      ifndef WONKY
+#      if defined(ZEND_ENGINE_2_4)
+#              define freeObject(o) \
+                       zend_object_std_dtor(o TSRMLS_CC); \
+                       efree(o);
+#      elif !defined(WONKY)
 #              define freeObject(o) \
                        if (OBJ_GUARDS(o)) { \
                                zend_hash_destroy(OBJ_GUARDS(o)); \