diff options
| author | Terry Wilson <twilson@digium.com> | 2012-03-07 15:08:08 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-03-07 15:08:08 +0000 |
| commit | 8b3704fbde54d1bfc33dcd0b135066822651ffa1 (patch) | |
| tree | 1ebcd5c14d773b8e6f3433c8d1ce654990ca3216 /cdr | |
| parent | 82ac7fb6435f1fda562db646f4f8a3c26892342f (diff) | |
Add detection for ODBC WCHAR fields
Without detecting these types, cel_odbc blows up when the character
set for the table is utf8. This also wraps cdr_adaptive_odbc's use of
those types in the HAVE_ODBC_WCHAR #ifdef seen in other parts of the
code.
........
Merged revisions 358435 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358436 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'cdr')
| -rw-r--r-- | cdr/cdr_adaptive_odbc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c index ecbce5bff..70e1aea71 100644 --- a/cdr/cdr_adaptive_odbc.c +++ b/cdr/cdr_adaptive_odbc.c @@ -449,9 +449,11 @@ static int odbc_log(struct ast_cdr *cdr) 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: |