[asterisk-commits] twilson: branch 1.8 r358435 - in /branches/1.8: cdr/ cel/

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Mar  7 09:03:40 2012
New Revision: 358435

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

Modified:
    branches/1.8/cdr/cdr_adaptive_odbc.c
    branches/1.8/cel/cel_odbc.c

Modified: branches/1.8/cdr/cdr_adaptive_odbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/cdr/cdr_adaptive_odbc.c?view=diff&rev=358435&r1=358434&r2=358435
==============================================================================
--- branches/1.8/cdr/cdr_adaptive_odbc.c (original)
+++ branches/1.8/cdr/cdr_adaptive_odbc.c Wed Mar  7 09:03:40 2012
@@ -421,9 +421,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/1.8/cel/cel_odbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/cel/cel_odbc.c?view=diff&rev=358435&r1=358434&r2=358435
==============================================================================
--- branches/1.8/cel/cel_odbc.c (original)
+++ branches/1.8/cel/cel_odbc.c Wed Mar  7 09:03:40 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: