reversed chomp alias addition as per Andi Gutmans' request

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 28094259da06767858eaa15303fef3284fd8f201..d047a59c750783a76bd454d6ee2626de9b83b7db 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -185,7 +185,6 @@ function_entry basic_functions[] = {
        PHP_FE(parse_str,                                                               second_arg_force_ref)
        PHP_FE(str_pad,                                                                 NULL)
        PHP_FALIAS(rtrim,                       chop,                           NULL)
-    PHP_FALIAS(chomp,           chop,               NULL)
        PHP_FALIAS(strchr,                      strstr,                         NULL)
        PHP_NAMED_FE(sprintf,           PHP_FN(user_sprintf),   NULL)
        PHP_NAMED_FE(printf,            PHP_FN(user_printf),    NULL)

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 44b45eb7ba3687bd575103b6f6650e597fe6b912..76d2d1b97b07ccd0b71b8844c5abd97cd3c6ebf3 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -176,10 +176,6 @@ PHPAPI void php_trim(zval *str, zval * return_value, int mode)
    An alias for chop */
 /* }}} */
 
-/* {{{ proto string chomp(string str)
-   An alias for chop */
-/* }}} */
-
 /* {{{ proto string chop(string str)
    Remove trailing whitespace */
 PHP_FUNCTION(chop)