[asterisk-commits] tilghman: branch 1.6.2 r201906 - in /branches/1.6.2: ./ res/res_config_odbc.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jun 19 10:49:13 2009
New Revision: 201906

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201906
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/res/res_config_odbc.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/res/res_config_odbc.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/res/res_config_odbc.c?view=diff&rev=201906&r1=201905&r2=201906
==============================================================================
--- branches/1.6.2/res/res_config_odbc.c (original)
+++ branches/1.6.2/res/res_config_odbc.c Fri Jun 19 10:49:13 2009
@@ -903,6 +903,9 @@
 				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:
@@ -984,7 +987,7 @@
 					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;
@@ -1003,7 +1006,7 @@
 						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;