diff options
| author | Harald Radi <phanto@php.net> | 2002-06-21 10:02:26 +0000 |
|---|---|---|
| committer | Harald Radi <phanto@php.net> | 2002-06-21 10:02:26 +0000 |
| commit | ed1b5c0388a8fb8e736e3eca42db38e3fb30b2ae (patch) | |
| tree | 274c93b00788bd9711b4a7e1ff2848337b50321e | |
| parent | 6869cb3f5a907500d9553c978fc491748585d9db (diff) | |
| download | php-git-ed1b5c0388a8fb8e736e3eca42db38e3fb30b2ae.tar.gz | |
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
| -rw-r--r-- | ext/com/COM.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ext/com/COM.c b/ext/com/COM.c index bba515b5ec..cbf9594e1c 100644 --- a/ext/com/COM.c +++ b/ext/com/COM.c @@ -2209,7 +2209,7 @@ PHPAPI int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC) 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 @@ PHPAPI int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC) } 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); |