[svn-commits] kpfleming: trunk r48578 - in /trunk: ./ funcs/func_odbc.c res/res_config_odbc.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue Dec 19 08:57:45 2006
New Revision: 48578

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48578
Log:
Merged revisions 48577 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48577 | kpfleming | 2006-12-19 08:57:09 -0600 (Tue, 19 Dec 2006) | 2 lines

use the proper variable type for these unixODBC API calls, eliminating warnings on 64-bit platforms that use the 'new' 64-bit types for ODBC API calls

........

Modified:
    trunk/   (props changed)
    trunk/funcs/func_odbc.c
    trunk/res/res_config_odbc.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/funcs/func_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_odbc.c?view=diff&rev=48578&r1=48577&r2=48578
==============================================================================
--- trunk/funcs/func_odbc.c (original)
+++ trunk/funcs/func_odbc.c Tue Dec 19 08:57:45 2006
@@ -104,7 +104,7 @@
 		AST_APP_ARG(field)[100];
 	);
 	SQLHSTMT stmt;
-	SQLINTEGER rows=0;
+	SQLLEN rows=0;
 
 	AST_LIST_LOCK(&queries);
 	AST_LIST_TRAVERSE(&queries, query, list) {
@@ -202,7 +202,7 @@
 	);
 	SQLHSTMT stmt;
 	SQLSMALLINT colcount=0;
-	SQLINTEGER indicator;
+	SQLLEN indicator;
 
 	AST_LIST_LOCK(&queries);
 	AST_LIST_TRAVERSE(&queries, query, list) {

Modified: trunk/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_config_odbc.c?view=diff&rev=48578&r1=48577&r2=48578
==============================================================================
--- trunk/res/res_config_odbc.c (original)
+++ trunk/res/res_config_odbc.c Tue Dec 19 08:57:45 2006
@@ -72,7 +72,7 @@
 	SQLSMALLINT datatype;
 	SQLSMALLINT decimaldigits;
 	SQLSMALLINT nullable;
-	SQLINTEGER indicator;
+	SQLLEN indicator;
 	va_list aq;
 	
 	va_copy(aq, ap);
@@ -222,7 +222,7 @@
 	SQLSMALLINT datatype;
 	SQLSMALLINT decimaldigits;
 	SQLSMALLINT nullable;
-	SQLINTEGER indicator;
+	SQLLEN indicator;
 
 	va_list aq;
 	va_copy(aq, ap);
@@ -449,7 +449,7 @@
 	char category[128];
 	char var_name[128];
 	char var_val[1024]; /* changed from 128 to 1024 via bug 8251 */
-	SQLINTEGER err;
+	SQLLEN err;
 };
 
 static SQLHSTMT config_odbc_prepare(struct odbc_obj *obj, void *data)