diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-10 18:18:39 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-10 18:18:39 +0000 |
| commit | b47dcc9b8b743bca30cb84de47a1a1a0b4e0c626 (patch) | |
| tree | ac749be46d6aef121436501fb70741110efa43b2 /res | |
| parent | 9c57a0c429e4668ad531e673dae23776d86b98f4 (diff) | |
Merged revisions 217638 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r217638 | tilghman | 2009-09-10 13:17:14 -0500 (Thu, 10 Sep 2009) | 4 lines
Verify support for wide ODBC character types before using them.
(closes issue #15870)
Reported by: nic_bellamy
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@217642 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_config_odbc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 8dcbbfb07..cdc5f063b 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -762,9 +762,11 @@ static int require_odbc(const char *database, const char *table, va_list ap) case SQL_CHAR: case SQL_VARCHAR: case SQL_LONGVARCHAR: +#ifdef HAVE_ODBC_WCHAR case SQL_WCHAR: case SQL_WVARCHAR: case SQL_WLONGVARCHAR: +#endif case SQL_BINARY: case SQL_VARBINARY: case SQL_LONGVARBINARY: |