diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-07-23 18:56:59 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-07-23 18:56:59 +0000 |
| commit | 84873a8e95874598426ae07282c8329fb7b20ca7 (patch) | |
| tree | 2dcf57ccfc608cad7b418ba848b48d58a42f1380 /res/res_odbc.c | |
| parent | 014f883315fae8571aa1889db219dfdccea5c21d (diff) | |
Merged revisions 279113 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r279113 | tilghman | 2010-07-23 13:56:04 -0500 (Fri, 23 Jul 2010) | 2 lines
Silly 64-bit compilers (who uses 64-bit anyway?)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@279115 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_odbc.c')
| -rw-r--r-- | res/res_odbc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_odbc.c b/res/res_odbc.c index 495f83f05..d2ee97948 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -1479,8 +1479,8 @@ static odbc_status odbc_obj_connect(struct odbc_obj *obj) ast_mutex_unlock(&obj->lock); return ODBC_FAIL; } - SQLSetConnectAttr(obj->con, SQL_LOGIN_TIMEOUT, (SQLPOINTER *) obj->parent->conntimeout, 0); - SQLSetConnectAttr(obj->con, SQL_ATTR_CONNECTION_TIMEOUT, (SQLPOINTER *) obj->parent->conntimeout, 0); + SQLSetConnectAttr(obj->con, SQL_LOGIN_TIMEOUT, (SQLPOINTER *)(long) obj->parent->conntimeout, 0); + SQLSetConnectAttr(obj->con, SQL_ATTR_CONNECTION_TIMEOUT, (SQLPOINTER *)(long) obj->parent->conntimeout, 0); #ifdef NEEDTRACE SQLSetConnectAttr(obj->con, SQL_ATTR_TRACE, &enable, SQL_IS_INTEGER); SQLSetConnectAttr(obj->con, SQL_ATTR_TRACEFILE, tracefile, strlen(tracefile)); |