cvs: php4 /ext/com COM.c

phanto Fri Jun 21 06:02:28 2002 EDT Modified files: /php4/ext/com COM.c Log: removed CONST_EFREE_PERSISTENT so that andi can commit his patch # this is one of these nice patches where you only remove something :) # i still don't get what CONST_EFREE_PERSISTENT should have done # there but the cvs log says that i can blame zeev :-P Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.80 php4/ext/com/COM.c:1.81 --- php4/ext/com/COM.c:1.80 Thu May 30 19:17:47 2002 +++ php4/ext/com/COM.c Fri Jun 21 06:02:26 2002 @@ -18,7 +18,7 @@ | Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: COM.c,v 1.80 2002/05/30 23:17:47 phanto Exp $ */ +/* $Id: COM.c,v 1.81 2002/06/21 10:02:26 phanto Exp $ */ /* * This module implements support for COM components that support the IDispatch * interface. Both local (COM) and remote (DCOM) components can be accessed. @@ -2209,7 +2209,7 @@ SysFreeString(bstr_ids); /* Before registering the contsnt, let's see if we can find it */ - if (zend_get_constant(c.name, c.name_len-1, &exists TSRMLS_CC)) { + if (zend_get_constant(c.name, c.name_len - 1, &exists TSRMLS_CC)) { /* Oops, it already exists. No problem if it is defined as the same value */ /* Check to see if they are the same */ if (!compare_function(&results, &c.value, &exists TSRMLS_CC) && INI_INT("com.autoregister_verbose")) { @@ -2221,10 +2221,6 @@ } php_variant_to_pval(pVarDesc->lpvarValue, &c.value, codepage TSRMLS_CC); - if (mode & CONST_PERSISTENT) { - zval_persist(&c.value TSRMLS_CC); - mode |= CONST_EFREE_PERSISTENT; - } c.flags = mode; zend_register_constant(&c TSRMLS_CC);