[asterisk-commits] tilghman: trunk r279115 - in /trunk: ./ res/res_odbc.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jul 23 13:56:59 2010
New Revision: 279115

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=279115
Log:
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?)
........

Modified:
    trunk/   (props changed)
    trunk/res/res_odbc.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Fri Jul 23 13:56:59 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-279056
+/branches/1.8:1-279056,279113

Modified: trunk/res/res_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_odbc.c?view=diff&rev=279115&r1=279114&r2=279115
==============================================================================
--- trunk/res/res_odbc.c (original)
+++ trunk/res/res_odbc.c Fri Jul 23 13:56:59 2010
@@ -1479,8 +1479,8 @@
 		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));