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

diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index ecbce5bffa6ac177077c9031d1c1f79e2826cedc..70e1aea7125b96685818984a2bff6e7c19e7a685 100644 (file)
--- 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:

diff --git a/cel/cel_odbc.c b/cel/cel_odbc.c
index 1a5427169b0f33f9536bd51628c2603accb14c0b..c7c8827dcbe0fe915c8b0c1f0bd52db035a17fe6 100644 (file)
--- 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: