diff options
| author | Sean Finney <seanius@debian.org> | 2010-02-07 22:19:53 +0100 |
|---|---|---|
| committer | Sean Finney <seanius@debian.org> | 2010-02-07 22:27:07 +0100 |
| commit | c852c28a88fccf6e34a2cb091fdfa72bce2b59c7 (patch) | |
| tree | 91f01b0d06916c78262404096bfd466b8e95e5b5 /ext/standard/php_array.h | |
| parent | 176cbd0bc99e20bb21f92f0b72df728eafc1e2ce (diff) | |
| parent | 0fab6db7cac8d2be99579dd049f812a8ff98e74f (diff) | |
| download | php-c852c28a88fccf6e34a2cb091fdfa72bce2b59c7.tar.gz | |
Merge branch 'upstream-experimental' into upstream-sid
Diffstat (limited to 'ext/standard/php_array.h')
| -rw-r--r-- | ext/standard/php_array.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index 0a5ec6487..76a5a66d0 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_array.h 272374 2008-12-31 11:17:49Z sebastian $ */ +/* $Id: php_array.h 272370 2008-12-31 11:15:49Z sebastian $ */ #ifndef PHP_ARRAY_H #define PHP_ARRAY_H @@ -66,6 +66,8 @@ PHP_FUNCTION(array_splice); PHP_FUNCTION(array_slice); PHP_FUNCTION(array_merge); PHP_FUNCTION(array_merge_recursive); +PHP_FUNCTION(array_replace); +PHP_FUNCTION(array_replace_recursive); PHP_FUNCTION(array_keys); PHP_FUNCTION(array_values); PHP_FUNCTION(array_count_values); @@ -100,9 +102,17 @@ PHP_FUNCTION(array_key_exists); PHP_FUNCTION(array_chunk); PHP_FUNCTION(array_combine); -HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **); +PHPAPI HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **); PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS_DC); -int multisort_compare(const void *a, const void *b TSRMLS_DC); +PHPAPI int php_array_replace_recursive(HashTable *dest, HashTable *src TSRMLS_DC); +PHPAPI int php_multisort_compare(const void *a, const void *b TSRMLS_DC); + +#define PHP_SORT_REGULAR 0 +#define PHP_SORT_NUMERIC 1 +#define PHP_SORT_STRING 2 +#define PHP_SORT_DESC 3 +#define PHP_SORT_ASC 4 +#define PHP_SORT_LOCALE_STRING 5 ZEND_BEGIN_MODULE_GLOBALS(array) int *multisort_flags[2]; |