[svn-commits] kpfleming: branch 1.4 r48577 - in /branches/1.4: funcs/ res/

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue Dec 19 08:57:09 2006
New Revision: 48577

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48577
Log:
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:
    branches/1.4/funcs/func_odbc.c
    branches/1.4/res/res_config_odbc.c

Modified: branches/1.4/funcs/func_odbc.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/funcs/func_odbc.c?view=diff&rev=48577&r1=48576&r2=48577
==============================================================================
--- branches/1.4/funcs/func_odbc.c (original)
+++ branches/1.4/funcs/func_odbc.c Tue Dec 19 08:57:09 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: branches/1.4/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_config_odbc.c?view=diff&rev=48577&r1=48576&r2=48577
==============================================================================
--- branches/1.4/res/res_config_odbc.c (original)
+++ branches/1.4/res/res_config_odbc.c Tue Dec 19 08:57:09 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)