From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 19 Jun 2009 15:48:37 +0000 (+0000)
Subject: Merged revisions 201904 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d6dbd377411837af59b1ed69a81cf2e1e1a3dba;p=thirdparty%2Fasterisk.git

Merged revisions 201904 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r201904 | tilghman | 2009-06-19 10:47:55 -0500 (Fri, 19 Jun 2009) | 4 lines

  Fix 2 typos and add support for wide character types.
  Reported by Benny Amorsen via the asterisk-users mailing list.
  http://lists.digium.com/pipermail/asterisk-users/2009-June/233622.html
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@201905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 4f4824d713..8dcbbfb078 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -762,6 +762,9 @@ static int require_odbc(const char *database, const char *table, va_list ap)
 				case SQL_CHAR:
 				case SQL_VARCHAR:
 				case SQL_LONGVARCHAR:
+				case SQL_WCHAR:
+				case SQL_WVARCHAR:
+				case SQL_WLONGVARCHAR:
 				case SQL_BINARY:
 				case SQL_VARBINARY:
 				case SQL_LONGVARBINARY:
@@ -843,7 +846,7 @@ static int require_odbc(const char *database, const char *table, va_list ap)
 					if (type != RQ_UINTEGER1 && type != RQ_INTEGER1 &&
 						type != RQ_UINTEGER2 && type != RQ_INTEGER2 &&
 						type != RQ_UINTEGER3 && type != RQ_INTEGER3 &&
-						type != RQ_UINTEGER4) {
+						type != RQ_INTEGER4) {
 						WARN_TYPE_OR_LENGTH(size)
 					}
 					break;
@@ -862,7 +865,7 @@ static int require_odbc(const char *database, const char *table, va_list ap)
 						type != RQ_UINTEGER2 && type != RQ_INTEGER2 &&
 						type != RQ_UINTEGER3 && type != RQ_INTEGER3 &&
 						type != RQ_UINTEGER4 && type != RQ_INTEGER4 &&
-						type != RQ_UINTEGER8) {
+						type != RQ_INTEGER8) {
 						WARN_TYPE_OR_LENGTH(size)
 					}
 					break;