Conditional compilation is replaced by macro

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 65175177341a004deaab3ccd4ccb5cd78e8d614c..37bb653e3b7af53a609f2592b1cb5efd2cabdf0f 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1043,11 +1043,7 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC
                                ) {
                                        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 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC
                                        *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;
                                }
                        }
                }