diff options
| author | Sascha Schumann <sas@php.net> | 1999-05-30 11:57:28 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-05-30 11:57:28 +0000 |
| commit | 577340bb9f009783729b079508916429ec0d44a0 (patch) | |
| tree | ff1451dee903600aa42b1b4eec419f488c480883 /ext/standard/browscap.c | |
| parent | cf4a2c3bfc183480f1aaeb44bf74824406c419f1 (diff) | |
| download | php-git-577340bb9f009783729b079508916429ec0d44a0.tar.gz | |
zend_hash_merge was changed
Diffstat (limited to 'ext/standard/browscap.c')
| -rw-r--r-- | ext/standard/browscap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index d04989ed6c..eae25b6c2b 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -121,7 +121,7 @@ PHP_FUNCTION(get_browser) if (_php3_hash_find(&browser_hash, agent_name->value.str.val, agent_name->value.str.len+1, (void **) &agent)==FAILURE) { break; } - _php3_hash_merge(return_value->value.ht,agent->value.ht,(void (*)(void *pData)) pval_copy_constructor, (void *) &tmp, sizeof(pval), 0); + _php3_hash_merge(return_value->value.ht,agent->value.ht,(void (*)(void *pData)) pval_copy_constructor, (void *) &tmp, sizeof(pval)); } } |