From 4a29944dac417a8c060ba2d2ad628534ed98e96b Mon Sep 17 00:00:00 2001 From: Harald Radi Date: Sun, 24 Jun 2001 22:20:28 +0000 Subject: [PATCH] added verbose ini entry --- ext/com/COM.c | 3 ++- ext/rpc/com/com_wrapper.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ext/com/COM.c b/ext/com/COM.c index c8a8ced4f4..6bc04d922d 100644 --- a/ext/com/COM.c +++ b/ext/com/COM.c @@ -443,6 +443,7 @@ static PHP_INI_MH(OnTypelibFileChange) PHP_INI_BEGIN() PHP_INI_ENTRY_EX("com.allow_dcom", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY_EX("com.autoregister_typelib", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) +PHP_INI_ENTRY_EX("com.autoregister_verbose", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY_EX("com.autoregister_casesensitive", "1", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY("com.typelib_file", "", PHP_INI_SYSTEM, OnTypelibFileChange) PHP_INI_END() @@ -1640,7 +1641,7 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode) { /* 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)) + if (!compare_function(&results, &c.value, &exists) && INI_INT("com.autoregister_verbose")) { php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name); } diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c index c8a8ced4f4..6bc04d922d 100644 --- a/ext/rpc/com/com_wrapper.c +++ b/ext/rpc/com/com_wrapper.c @@ -443,6 +443,7 @@ static PHP_INI_MH(OnTypelibFileChange) PHP_INI_BEGIN() PHP_INI_ENTRY_EX("com.allow_dcom", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY_EX("com.autoregister_typelib", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) +PHP_INI_ENTRY_EX("com.autoregister_verbose", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY_EX("com.autoregister_casesensitive", "1", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY("com.typelib_file", "", PHP_INI_SYSTEM, OnTypelibFileChange) PHP_INI_END() @@ -1640,7 +1641,7 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode) { /* 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)) + if (!compare_function(&results, &c.value, &exists) && INI_INT("com.autoregister_verbose")) { php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name); } -- 2.40.0