dmitry Wed, 26 May 2010 15:42:59 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=299796
Log:
Conditional compilation is replaced by macro
Changed paths:
U php/php-src/trunk/Zend/zend_API.c
Modified: php/php-src/trunk/Zend/zend_API.c
===================================================================
--- php/php-src/trunk/Zend/zend_API.c 2010-05-26 15:26:10 UTC (rev 299795)
+++ php/php-src/trunk/Zend/zend_API.c 2010-05-26 15:42:59 UTC (rev 299796)
@@ -1043,11 +1043,7 @@
) {
Z_ADDREF_PP(p);
Z_SET_ISREF_PP(p);
-#if ZTS
-
CG(static_members_table)[(zend_intptr_t)(class_type->static_members_table)][i]
= *p;
-#else
- class_type->static_members_table[i] =
*p;
-#endif
+ CE_STATIC_MEMBERS(class_type)[i] = *p;
} else {
zval *r;
@@ -1055,11 +1051,7 @@
*r = **p;
INIT_PZVAL(r);
zval_copy_ctor(r);
-#if ZTS
-
CG(static_members_table)[(zend_intptr_t)(class_type->static_members_table)][i]
= r;
-#else
- class_type->static_members_table[i] = r;
-#endif
+ CE_STATIC_MEMBERS(class_type)[i] = r;
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
