diff options
| author | Stig Venaas <venaas@php.net> | 2000-06-10 19:09:56 +0000 |
|---|---|---|
| committer | Stig Venaas <venaas@php.net> | 2000-06-10 19:09:56 +0000 |
| commit | f18b903d5f0bf7b99a4c387fd5cb2de1787abd3b (patch) | |
| tree | eb4fd37de551629adbf9966af1f752ebfe823c9a | |
| parent | 99f151f1bde0483944767cf0ed49d3270f61d326 (diff) | |
| download | php-git-f18b903d5f0bf7b99a4c387fd5cb2de1787abd3b.tar.gz | |
Changed array_subtract to array_diff
| -rw-r--r-- | ext/standard/array.c | 4 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 2 | ||||
| -rw-r--r-- | ext/standard/php_array.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index a4669e52e6..72462a245c 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2291,10 +2291,10 @@ out: } /* }}} */ -/* {{{ proto array array_subtract(array arr1, array arr2 [, ...]) +/* {{{ proto array array_diff(array arr1, array arr2 [, ...]) Returns the entries of arr1 that have values which are not present in any of the others arguments */ -PHP_FUNCTION(array_subtract) +PHP_FUNCTION(array_diff) { zval ***args = NULL; HashTable *hash; diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 5d4baa16a0..40eb1c2a69 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -509,7 +509,7 @@ function_entry basic_functions[] = { PHP_FE(array_rand, NULL) PHP_FE(array_unique, NULL) PHP_FE(array_intersect, NULL) - PHP_FE(array_subtract, NULL) + PHP_FE(array_diff, NULL) /* aliases from array.c */ PHP_FALIAS(pos, current, first_arg_force_ref) diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index b0d803e9eb..3497b626fa 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -71,7 +71,7 @@ PHP_FUNCTION(array_flip); PHP_FUNCTION(array_rand); PHP_FUNCTION(array_unique); PHP_FUNCTION(array_intersect); -PHP_FUNCTION(array_subtract); +PHP_FUNCTION(array_diff); HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **); int multisort_compare(const void *a, const void *b); |