diff options
| -rw-r--r-- | main/sorcery.c | 4 | ||||
| -rw-r--r-- | tests/test_sorcery.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/main/sorcery.c b/main/sorcery.c index ca7efb0bc..bed4d8533 100644 --- a/main/sorcery.c +++ b/main/sorcery.c @@ -39,6 +39,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/netsock2.h" #include "asterisk/module.h" +/* To prevent DEBUG_FD_LEAKS from interfering with things we undef open and close */ +#undef open +#undef close + /*! \brief Number of buckets for wizards (should be prime for performance reasons) */ #define WIZARD_BUCKETS 7 diff --git a/tests/test_sorcery.c b/tests/test_sorcery.c index 66dce34ee..cf53b1918 100644 --- a/tests/test_sorcery.c +++ b/tests/test_sorcery.c @@ -195,7 +195,7 @@ AST_TEST_DEFINE(wizard_registration) return AST_TEST_PASS; } -AST_TEST_DEFINE(open) +AST_TEST_DEFINE(sorcery_open) { RAII_VAR(struct ast_sorcery *, sorcery, NULL, ast_sorcery_unref); @@ -1937,7 +1937,7 @@ AST_TEST_DEFINE(configuration_file_wizard_retrieve_multiple_all) static int unload_module(void) { AST_TEST_UNREGISTER(wizard_registration); - AST_TEST_UNREGISTER(open); + AST_TEST_UNREGISTER(sorcery_open); AST_TEST_UNREGISTER(apply_default); AST_TEST_UNREGISTER(apply_config); AST_TEST_UNREGISTER(object_register); @@ -1976,7 +1976,7 @@ static int unload_module(void) static int load_module(void) { AST_TEST_REGISTER(wizard_registration); - AST_TEST_REGISTER(open); + AST_TEST_REGISTER(sorcery_open); AST_TEST_REGISTER(apply_default); AST_TEST_REGISTER(apply_config); AST_TEST_REGISTER(object_register); |