]> granicus.if.org Git - php/commitdiff
removed CONST_EFREE_PERSISTENT so that andi can commit his patch
authorHarald Radi <phanto@php.net>
Fri, 21 Jun 2002 10:02:26 +0000 (10:02 +0000)
committerHarald Radi <phanto@php.net>
Fri, 21 Jun 2002 10:02:26 +0000 (10:02 +0000)
# 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

ext/com/COM.c

index bba515b5ec436362154b4ae508d8e2099174b3bb..cbf9594e1c82ce36b0b60d7c0d82efc8545fbf59 100644 (file)
@@ -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);