- Remove bogus macros

diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 8384a37123967dfe3b6958ca0e4bedef8844761a..78a6922ecf7471c620cc258118ebc6648276f55d 100644 (file)
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -230,12 +230,6 @@ ZEND_API void zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_DC);
                convert_to_##lower_type(*ppzv);                                         \
        }
 
-#define convert_to_writable_ex_master(ppzv, lower_type, upper_type)    \
-       if ((*ppzv)->type!=IS_##upper_type) {                                                   \
-               SEPARATE_ZVAL(ppzv);                                                                            \
-               convert_to_##lower_type(*ppzv);                                                         \
-       }
-
 
 #define convert_to_boolean_ex(ppzv)    convert_to_ex_master(ppzv, boolean, BOOL)
 #define convert_to_long_ex(ppzv)       convert_to_ex_master(ppzv, long, LONG)
@@ -245,15 +239,6 @@ ZEND_API void zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_DC);
 #define convert_to_object_ex(ppzv)     convert_to_ex_master(ppzv, object, OBJECT)
 #define convert_to_null_ex(ppzv)       convert_to_ex_master(ppzv, null, NULL)
 
-#define convert_to_writable_boolean_ex(ppzv)   convert_to_writable_ex_master(ppzv, boolean, BOOL)
-#define convert_to_writable_long_ex(ppzv)              convert_to_writable_ex_master(ppzv, long, LONG)
-#define convert_to_writable_double_ex(ppzv)            convert_to_writable_ex_master(ppzv, double, DOUBLE)
-#define convert_to_writable_string_ex(ppzv)            convert_to_writable_ex_master(ppzv, string, STRING)
-#define convert_to_writable_array_ex(ppzv)             convert_to_writable_ex_master(ppzv, array, ARRAY)
-#define convert_to_writable_object_ex(ppzv)            convert_to_writable_ex_master(ppzv, object, OBJECT)
-#define convert_to_writable_null_ex(ppzv)              convert_to_writable_ex_master(ppzv, null, NULL)
-
-
 #define convert_scalar_to_number_ex(ppzv)                                                      \
        if ((*ppzv)->type!=IS_LONG && (*ppzv)->type!=IS_DOUBLE) {               \
                if (!(*ppzv)->is_ref) {                                                                         \