From: Sascha Schumann <sas@php.net>
Date: Sun, 30 May 1999 11:57:28 +0000 (+0000)
Subject: zend_hash_merge was changed
X-Git-Tag: BEFORE_REMOVING_GC_STEP1~229
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=577340bb9f009783729b079508916429ec0d44a0;p=php

zend_hash_merge was changed
---

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));
 	}
 }