From 0d64d036a5bb8fd0ac0ad5ddf778ab20e6ee3110 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 30 Nov 2021 12:45:40 +0100 Subject: Replace unixODBC to iODBC that is BSD licensed Change-Id: Ia794fd97bb70b1e33385517971a174430d11cab7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126117 Tested-by: Jenkins CollaboraOffice Reviewed-by: Michael Meeks --- connectivity/source/drivers/odbc/OPreparedStatement.cxx | 2 +- connectivity/source/drivers/odbc/OTools.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 65cfbf5e7b5f..0b535cef3d2e 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -306,7 +306,7 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_ * ODBC Programmer's reference > Developing Applications > Programming Considerations > Unicode > Unicode Function Arguments * http://support.microsoft.com/kb/294169 * - * UnixODBC can be configured at compile-time so that the "W" variants expect + * iODBC can be configured at compile-time so that the "W" variants expect * UTF-16 or UTF-32 encoded strings, and character lengths are number of codepoints. * However, UTF-16 is the default, what all/most distributions do * and the established API that most drivers implement. diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx index 4781415de474..e65da53c20cf 100644 --- a/connectivity/source/drivers/odbc/OTools.cxx +++ b/connectivity/source/drivers/odbc/OTools.cxx @@ -65,7 +65,7 @@ size_t sqlTypeLen ( SQLSMALLINT _nType ) return sizeof(SQLBIGINT); case SQL_C_UBIGINT: return sizeof(SQLUBIGINT); - /* UnixODBC gives this the same value as SQL_C_UBIGINT + /* iODBC gives this the same value as SQL_C_UBIGINT case SQL_C_BOOKMARK: return sizeof(BOOKMARK); */ case SQL_C_TYPE_DATE: @@ -99,7 +99,7 @@ size_t sqlTypeLen ( SQLSMALLINT _nType ) case SQL_C_CHAR: case SQL_C_WCHAR: case SQL_C_BINARY: - // UnixODBC gives this the same value as SQL_C_BINARY + // iODBC gives this the same value as SQL_C_BINARY //case SQL_C_VARBOOKMARK: // Unknown datatype -> cannot predict length default: -- cgit