- Remove _EX and make it the old _LENGTH

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 2b3ccb5778c53100d8709218b13314923a2e81d1..ab2270f81d711559587376b5924d498374ddf1b1 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -239,17 +239,14 @@ ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length,
                                                        }
 
 
-#define ZEND_SET_SYMBOL(symtable, name, var)                                                                   \
-       {                                                                                                                                                       \
-               char *_name = (name);                                                                                                   \
-                                                                                                                                                               \
-               ZEND_SET_SYMBOL_WITH_LENGTH(symtable, _name, strlen(_name)+1, var, 0);  \
+#define ZEND_SET_SYMBOL(symtable, name, var)                                                                           \
+       {                                                                                                                                                               \
+               char *_name = (name);                                                                                                           \
+                                                                                                                                                                       \
+               ZEND_SET_SYMBOL_WITH_LENGTH(symtable, _name, strlen(_name)+1, var, 0, 0);       \
        }
 
-#define ZEND_SET_SYMBOL_WITH_LENGTH(symtable, name, name_length, var, _refcount) \
-                       ZEND_SET_SYMBOL_WITH_LENGTH_EX(symtable, name, name_length, var, _refcount, 0)
-
-#define ZEND_SET_SYMBOL_WITH_LENGTH_EX(symtable, name, name_length, var, _refcount, _is_ref)                   \
+#define ZEND_SET_SYMBOL_WITH_LENGTH(symtable, name, name_length, var, _refcount, _is_ref)                              \
        {                                                                                                                                                                                                       \
                zval **orig_var;                                                                                                                                                                \
                                                                                                                                                                                                                \