From 274f3aa727055eb5698f5131439af15451e806e5 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Sat, 29 May 1999 18:28:46 +0000 Subject: [PATCH] Fix --- ext/standard/browscap.c | 2 +- testobj | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index eae25b6c2b..d04989ed6c 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)); + _php3_hash_merge(return_value->value.ht,agent->value.ht,(void (*)(void *pData)) pval_copy_constructor, (void *) &tmp, sizeof(pval), 0); } } diff --git a/testobj b/testobj index 26ca69bf00..1c2aa7f2c0 100644 --- a/testobj +++ b/testobj @@ -7,8 +7,8 @@ class foobar { } }; -//$foo = new foobar or die("Unable to construct foobar\n"); -$word = new COm("word.application"); -$word->visible = true; -sleep(5); -$word->quit(); +$foo = new foobar; // or die("Unable to construct foobar\n"); +//$word = new COm("word.application"); +//$word->visible = true; +//sleep(5); +//$word->quit(); -- 2.50.1