diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2022-02-17 17:19:15 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2022-02-17 18:35:06 +0100 |
| commit | de4d89160e48dda88d1a0e05cee28bb1551355b4 (patch) | |
| tree | a6bb7c80975382004fe9685c8b221b334dfdcb67 /connectivity | |
| parent | fe6043136fd3ba0333b99b8ca4dda699961c2bfd (diff) | |
Revert "ODBC: fix signatures of Bulk, SpecialColumns et NativeSQL"
This reverts partly commit 8942956e05f2208ffb666a2118f5db092c30ce6a.
Reason, Lionel indicates:
In general UnixODBC has to deal with more portability to more platforms,
so I would tend to more follow their signatures than the ones of Microsoft, that has to deal with only Windows OS on less CPU ABIs.
Change-Id: I8b8924d35aa86ac23a8191baa8584463941eddc9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130084
Reviewed-by: Lionel Mamane <lionel@mamane.lu>
Tested-by: Jenkins
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/inc/odbc/OFunctions.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx index 4033fa23c1e7..a44fe5a15031 100644 --- a/connectivity/source/inc/odbc/OFunctions.hxx +++ b/connectivity/source/inc/odbc/OFunctions.hxx @@ -336,7 +336,7 @@ bool LoadLibrary_ODBC3(OUString &_rPath); #define N3SQLSetPos(a,b,c,d) (*reinterpret_cast<T3SQLSetPos>(getOdbcFunction(ODBC3SQLFunctionId::SetPos)))(a,b,c,d) typedef SQLRETURN (SQL_API *T3SQLBulkOperations) ( SQLHSTMT StatementHandle, - SQLUSMALLINT Operation); + SQLSMALLINT Operation); #define N3SQLBulkOperations(a,b) (*reinterpret_cast<T3SQLBulkOperations>(getOdbcFunction(ODBC3SQLFunctionId::BulkOperations)))(a,b) @@ -440,15 +440,15 @@ bool LoadLibrary_ODBC3(OUString &_rPath); #define N3SQLProcedures(a,b,c,d,e,f,g) (*reinterpret_cast<T3SQLProcedures>(getOdbcFunction(ODBC3SQLFunctionId::Procedures)))(a,b,c,d,e,f,g) typedef SQLRETURN (SQL_API *T3SQLSpecialColumns) (SQLHSTMT StatementHandle, - SQLSMALLINT IdentifierType, + SQLUSMALLINT IdentifierType, SQLCHAR * CatalogName, SQLSMALLINT NameLength1, SQLCHAR * SchemaName, SQLSMALLINT NameLength2, SQLCHAR * TableName, SQLSMALLINT NameLength3, - SQLSMALLINT Scope, - SQLSMALLINT Nullable); + SQLUSMALLINT Scope, + SQLUSMALLINT Nullable); #define N3SQLSpecialColumns(a,b,c,d,e,f,g,h,i,j) (*reinterpret_cast<T3SQLSpecialColumns>(getOdbcFunction(ODBC3SQLFunctionId::SpecialColumns)))(a,b,c,d,e,f,g,h,i,j) |