diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-10 18:19:58 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-10 18:19:58 +0000 |
| commit | d4a2be41f5adda2f9588915c4487d544e81b5b39 (patch) | |
| tree | af528652573a8fe356363ac24f2152a1e8289060 /res | |
| parent | 485b22713e3523aff57475cf656792fa41b24f65 (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.2@217647 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 1a76b09d8..8fff35d2c 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -903,9 +903,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: |