kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ABI differences that occured when compiling with DEBUG_THREADS.

Browse Source 
"Bad Things" would happen if Asterisk was compiled with DEBUG_THREADS, but a
loaded module was not (or vice versa).  This also immensely simplifies the
lock code, since there are no longer 2 separate versions of them.

Review: https://reviewboard.asterisk.org/r/508/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@258557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2010-04-22 19:08:01 +00:00
parent a753e8878b
commit 9e3f5fa6fb
8 changed files with 1517 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_odbc.c
View File

@@ -1150,11 +1150,7 @@ static int aoro2_obj_cb(void *vobj, void *arg, int flags)
return 0;
}
#ifdef DEBUG_THREADS
struct odbc_obj *_ast_odbc_request_obj2(const char *name, struct ast_flags flags, const char *file, const char *function, int lineno)
#else
struct odbc_obj *ast_odbc_request_obj2(const char *name, struct ast_flags flags)
#endif
{
struct odbc_obj *obj = NULL;
struct odbc_class *class;
@@ -1325,18 +1321,10 @@ struct odbc_obj *ast_odbc_request_obj2(const char *name, struct ast_flags flags)
return obj;
}
#ifdef DEBUG_THREADS
struct odbc_obj *_ast_odbc_request_obj(const char *name, int check, const char *file, const char *function, int lineno)
#else
struct odbc_obj *ast_odbc_request_obj(const char *name, int check)
#endif
{
struct ast_flags flags = { check ? RES_ODBC_SANITY_CHECK : 0 };
#ifdef DEBUG_THREADS
return _ast_odbc_request_obj2(name, flags, file, function, lineno);
#else
return ast_odbc_request_obj2(name, flags);
#endif
}
struct odbc_obj *ast_odbc_retrieve_transaction_obj(struct ast_channel *chan, const char *objname)