[PHP4BETA] CVS update: php4/ext/standard
| From: | sas | Date: | Sun, 30 May 1999 11:57:29 +0000 |
| Subject: | [PHP4BETA] CVS update: php4/ext/standard | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1203@lists.php.net to get a copy of this message | ||
Date: Sunday May 30, 1999 @ 7:57
Author: sas
Update of /repository/php4/ext/standard
In directory php:/tmp/cvs-serv21245
Modified Files:
browscap.c
Log Message:
zend_hash_merge was changed
Index: php4/ext/standard/browscap.c
diff -u php4/ext/standard/browscap.c:1.6 php4/ext/standard/browscap.c:1.7
--- php4/ext/standard/browscap.c:1.6 Sat May 29 14:28:46 1999
+++ php4/ext/standard/browscap.c Sun May 30 07:57:28 1999
@@ -121,7 +121,7 @@
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));
}
}
--
PHP 4 Beta