]> granicus.if.org Git - php/commitdiff
zend_hash_merge was changed
authorSascha Schumann <sas@php.net>
Sun, 30 May 1999 11:57:28 +0000 (11:57 +0000)
committerSascha Schumann <sas@php.net>
Sun, 30 May 1999 11:57:28 +0000 (11:57 +0000)
ext/standard/browscap.c

index d04989ed6cc9443ce62ee5d1448db321afbb0e70..eae25b6c2b9646cbe68daca2441febe7a024e78a 100644 (file)
@@ -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));
        }
 }