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 /include/asterisk/res_odbc.h | |
| 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 'include/asterisk/res_odbc.h')
| -rw-r--r-- | include/asterisk/res_odbc.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/asterisk/res_odbc.h b/include/asterisk/res_odbc.h index 1de1626e8..2bca41732 100644 --- a/include/asterisk/res_odbc.h +++ b/include/asterisk/res_odbc.h @@ -111,19 +111,11 @@ int ast_odbc_smart_execute(struct odbc_obj *obj, SQLHSTMT stmt) __attribute__((d * thread which requests it. Note that all connections should be released * when the thread is done by calling odbc_release_obj(), below. */ -#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); -#define ast_odbc_request_obj2(a, b) _ast_odbc_request_obj2(a, b, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#else -struct odbc_obj *ast_odbc_request_obj2(const char *name, struct ast_flags flags); -#endif - -#ifdef DEBUG_THREADS struct odbc_obj *_ast_odbc_request_obj(const char *name, int check, const char *file, const char *function, int lineno); + +#define ast_odbc_request_obj2(a, b) _ast_odbc_request_obj2(a, b, __FILE__, __PRETTY_FUNCTION__, __LINE__) #define ast_odbc_request_obj(a, b) _ast_odbc_request_obj(a, b, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#else -struct odbc_obj *ast_odbc_request_obj(const char *name, int check); -#endif /*! * \brief Retrieve a stored ODBC object, if a transaction has been started. |