summaryrefslogtreecommitdiff
path: root/ext/standard/php_array.h
diff options
context:
space:
mode:
authorEdin Kadribasic <edink@php.net>2002-09-10 22:36:43 +0000
committerEdin Kadribasic <edink@php.net>2002-09-10 22:36:43 +0000
commit333b01b0416620d9b54ddbb45c5d825397663988 (patch)
treed101ea3902d25a75ed4ef962a1f4e0ab0ccb57b4 /ext/standard/php_array.h
parentdd7cf2244311603e76f89d1c766767664c8527fc (diff)
downloadphp-git-333b01b0416620d9b54ddbb45c5d825397663988.tar.gz
Fixed ZTS build.
Diffstat (limited to 'ext/standard/php_array.h')
-rw-r--r--ext/standard/php_array.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h
index 0ef979c550..60daa1fe53 100644
--- a/ext/standard/php_array.h
+++ b/ext/standard/php_array.h
@@ -83,7 +83,7 @@ PHP_FUNCTION(array_key_exists);
PHP_FUNCTION(array_chunk);
HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **);
-PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive);
+PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS_DC);
int multisort_compare(const void *a, const void *b TSRMLS_DC);
typedef struct {