From 8b3704fbde54d1bfc33dcd0b135066822651ffa1 Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Wed, 7 Mar 2012 15:08:08 +0000 Subject: 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 --- cel/cel_odbc.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cel') diff --git a/cel/cel_odbc.c b/cel/cel_odbc.c index 1a5427169..c7c8827dc 100644 --- a/cel/cel_odbc.c +++ b/cel/cel_odbc.c @@ -487,6 +487,11 @@ static void odbc_log(const struct ast_event *event, void *userdata) 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: -- cgit v1.2.3