connectivity/source/inc/odbc/OFunctions.hxx | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
New commits:
commit dbb42ebced375a366712394c1e8917e78abd7a5e
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sun Nov 19 14:37:19 2017 +0000
Fix an argument for SQLSetDescRec.
Remove a duplicated and commented T3SQLNativeSql definition.
Patch by: me
(cherry picked from commit 72c9a57b915e080b4bd27800f30232624172b1c3)
Change-Id: I2730ede794f750181075b253f62951d47ec82ddc
Reviewed-on: https://gerrit.libreoffice.org/45176
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/connectivity/source/inc/odbc/OFunctions.hxx
b/connectivity/source/inc/odbc/OFunctions.hxx
index 2ad9043541b1..95787a1db4d2 100644
--- a/connectivity/source/inc/odbc/OFunctions.hxx
+++ b/connectivity/source/inc/odbc/OFunctions.hxx
@@ -188,7 +188,7 @@ bool LoadLibrary_ODBC3(OUString &_rPath);
SQLSMALLINT
RecNumber,
SQLSMALLINT Type,
SQLSMALLINT
SubType,
- SQLINTEGER Length,
+ SQLLEN Length,
SQLSMALLINT
Precision,
SQLSMALLINT Scale,
SQLPOINTER
DataPtr,
@@ -243,15 +243,6 @@ bool LoadLibrary_ODBC3(OUString &_rPath);
#define N3SQLExecDirect(a,b,c)
(*reinterpret_cast<T3SQLExecDirect>(getOdbcFunction(ODBC3SQLFunctionId::ExecDirect)))(a,b,c)
- /*typedef SQLRETURN (SQL_API *T3SQLNativeSql) ( SQLHDBC
ConnectionHandle,
- SQLCHAR *
InStatementText,
- SQLINTEGER
TextLength1,
- SQLCHAR *
utStatementText,
- SQLINTEGER
BufferLength,
- SQLINTEGER *
TextLength2Ptr);
-
- #define N3SQLNativeSql(a,b,c,d,e,f)
(*reinterpret_cast<T3SQLNativeSql>(getOdbcFunction(ODBC3SQLFunctionId::NativeSql)))(a,b,c,d,e,f)*/
-
typedef SQLRETURN (SQL_API *T3SQLDescribeParam) (SQLHSTMT
StatementHandle,
SQLUSMALLINT
ParameterNumber,
SQLSMALLINT *
DataTypePtr,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
