diff options
| author | Jason Parker <jparker@digium.com> | 2010-04-22 19:08:01 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2010-04-22 19:08:01 +0000 |
| commit | 9e3f5fa6fbd98d094c3f78b57cf80bcf81ab89d4 (patch) | |
| tree | 7d5f10f305e5407fdfc584f251071ca5f299dda6 /res | |
| parent | a753e8878b8a30122fd5f0af45bad242de0cb303 (diff) | |
Remove ABI differences that occured when compiling with DEBUG_THREADS.
"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
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_odbc.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/res/res_odbc.c b/res/res_odbc.c index 9498cc591..1859f766b 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -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) |