diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-19 15:49:13 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-19 15:49:13 +0000 |
| commit | bcdaa60ecca56d30abff20c925a73e9d007edab9 (patch) | |
| tree | 11a9309d4cfe09b5efb14fd43a87cb727cf763c4 /res | |
| parent | 120347fe4887bed1fc0e2d4a46b64afa05eef12b (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@201906 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_config_odbc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 8da1e2915..1a76b09d8 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -903,6 +903,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: @@ -984,7 +987,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; @@ -1003,7 +1006,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; |