- now I know what to use TSRMLS_SET_CTX() and TSRMLS_FETCH_FROM_CTX() for...

[m6w6/ext-http] / php_http_std_defs.h

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 4d3658716847ccc199846e58a6051404d1f228f2..0e0bc142d4ca10b6cad9a540a819ff2253fded0a 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -171,6 +171,7 @@ typedef int STATUS;
 /* {{{ objects & properties */
 #ifdef ZEND_ENGINE_2
 
+#      define HTTP_STATIC_ME_ALIAS(me, al, ai) ZEND_FENTRY(me, ZEND_FN(al), ai, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
 
 #      define HTTP_REGISTER_CLASS_EX(classname, name, parent, flags) \
        { \
@@ -198,9 +199,12 @@ typedef int STATUS;
 #      define DCL_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a) TSRMLS_CC)
 #      define DCL_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a) TSRMLS_CC)
 #      define DCL_PROP_N(a, n) zend_declare_property_null(ce, (#n), sizeof(#n), (ZEND_ACC_ ##a) TSRMLS_CC)
-#      define UPD_PROP(o, t, n, v) zend_update_property_ ##t(o->zo.ce, getThis(), (#n), sizeof(#n), (v) TSRMLS_CC)
-#      define SET_PROP(o, n, z) zend_update_property(o->zo.ce, getThis(), (#n), sizeof(#n), (z) TSRMLS_CC)
-#      define GET_PROP(o, n) zend_read_property(o->zo.ce, getThis(), (#n), sizeof(#n), 0 TSRMLS_CC)
+#      define UPD_PROP(o, t, n, v) UPD_PROP_EX(o, getThis(), t, n, v)
+#      define UPD_PROP_EX(o, this, t, n, v) zend_update_property_ ##t(o->zo.ce, this, (#n), sizeof(#n), (v) TSRMLS_CC)
+#      define SET_PROP(o, n, z) SET_PROP_EX(o, getThis(), n, z)
+#      define SET_PROP_EX(o, this, n, z) zend_update_property(o->zo.ce, this, (#n), sizeof(#n), (z) TSRMLS_CC)
+#      define GET_PROP(o, n) GET_PROP_EX(o, getThis(), n)
+#      define GET_PROP_EX(o, this, n) zend_read_property(o->zo.ce, this, (#n), sizeof(#n), 0 TSRMLS_CC)
 
 #      define INIT_PARR(o, n) \
        { \