From: Harald Radi <phanto@php.net>
Date: Fri, 21 Jun 2002 10:02:26 +0000 (+0000)
Subject: removed CONST_EFREE_PERSISTENT so that andi can commit his patch
X-Git-Tag: php-4.3.0dev_zend2_alpha2~170
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed1b5c0388a8fb8e736e3eca42db38e3fb30b2ae;p=php

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
---

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