kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue where building with DEBUG_FD_LEAKS enabled would not work due to sorcery using calls called "open" and "close".

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@380407 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2013-01-29 20:19:28 +00:00
parent 8cc7aea09b
commit ffaf79b1eb
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/sorcery.c
View File

@@ -39,6 +39,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/netsock2.h" #include "asterisk/netsock2.h"
#include "asterisk/module.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) */ /*! \brief Number of buckets for wizards (should be prime for performance reasons) */
#define WIZARD_BUCKETS 7 #define WIZARD_BUCKETS 7

6
tests/test_sorcery.c
View File

@@ -195,7 +195,7 @@ AST_TEST_DEFINE(wizard_registration)
return AST_TEST_PASS; return AST_TEST_PASS;
} }
AST_TEST_DEFINE(open) AST_TEST_DEFINE(sorcery_open)
{ {
RAII_VAR(struct ast_sorcery *, sorcery, NULL, ast_sorcery_unref); 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) static int unload_module(void)
{ {
AST_TEST_UNREGISTER(wizard_registration); AST_TEST_UNREGISTER(wizard_registration);
AST_TEST_UNREGISTER(open); AST_TEST_UNREGISTER(sorcery_open);
AST_TEST_UNREGISTER(apply_default); AST_TEST_UNREGISTER(apply_default);
AST_TEST_UNREGISTER(apply_config); AST_TEST_UNREGISTER(apply_config);
AST_TEST_UNREGISTER(object_register); AST_TEST_UNREGISTER(object_register);
@@ -1976,7 +1976,7 @@ static int unload_module(void)
static int load_module(void) static int load_module(void)
{ {
AST_TEST_REGISTER(wizard_registration); AST_TEST_REGISTER(wizard_registration);
AST_TEST_REGISTER(open); AST_TEST_REGISTER(sorcery_open);
AST_TEST_REGISTER(apply_default); AST_TEST_REGISTER(apply_default);
AST_TEST_REGISTER(apply_config); AST_TEST_REGISTER(apply_config);
AST_TEST_REGISTER(object_register); AST_TEST_REGISTER(object_register);