diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-19 14:57:45 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-19 14:57:45 +0000 |
| commit | 3f07ee6c8d285bfe4b050444a2aba19e84f7bfdc (patch) | |
| tree | 23c1e713398429f01c5e1ee01ec3a25ff4e19e2b | |
| parent | 2ff95391f1893f3c0c5eb8a3374ee82da0c48b06 (diff) | |
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
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48578 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | funcs/func_odbc.c | 4 | ||||
| -rw-r--r-- | res/res_config_odbc.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index 10145be82..529a342ff 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -104,7 +104,7 @@ static int acf_odbc_write(struct ast_channel *chan, char *cmd, char *s, const ch 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 @@ static int acf_odbc_read(struct ast_channel *chan, char *cmd, char *s, char *buf ); SQLHSTMT stmt; SQLSMALLINT colcount=0; - SQLINTEGER indicator; + SQLLEN indicator; AST_LIST_LOCK(&queries); AST_LIST_TRAVERSE(&queries, query, list) { diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 4bfc1db44..3ef3edd33 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -72,7 +72,7 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl SQLSMALLINT datatype; SQLSMALLINT decimaldigits; SQLSMALLINT nullable; - SQLINTEGER indicator; + SQLLEN indicator; va_list aq; va_copy(aq, ap); @@ -222,7 +222,7 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char * SQLSMALLINT datatype; SQLSMALLINT decimaldigits; SQLSMALLINT nullable; - SQLINTEGER indicator; + SQLLEN indicator; va_list aq; va_copy(aq, ap); @@ -449,7 +449,7 @@ struct config_odbc_obj { 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) |