[svn-commits] twilson: branch 10 r358436 - in /branches/10: ./ cdr/ cel/

[SVN commits to the Digium repositories]

Author: twilson
Date: Wed Mar  7 09:07:04 2012
New Revision: 358436

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=358436
Log:
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

Modified:
    branches/10/   (props changed)
    branches/10/cdr/cdr_adaptive_odbc.c
    branches/10/cel/cel_odbc.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/cdr/cdr_adaptive_odbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/cdr/cdr_adaptive_odbc.c?view=diff&rev=358436&r1=358435&r2=358436
==============================================================================
--- branches/10/cdr/cdr_adaptive_odbc.c (original)
+++ branches/10/cdr/cdr_adaptive_odbc.c Wed Mar  7 09:07:04 2012
@@ -431,9 +431,11 @@
 				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:

Modified: branches/10/cel/cel_odbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/cel/cel_odbc.c?view=diff&rev=358436&r1=358435&r2=358436
==============================================================================
--- branches/10/cel/cel_odbc.c (original)
+++ branches/10/cel/cel_odbc.c Wed Mar  7 09:07:04 2012
@@ -468,6 +468,11 @@
 				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: