diff options
author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-04-27 00:57:05 +0900 |
---|---|---|
committer | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2024-01-06 02:37:26 +0100 |
commit | 00eae23267bf64e07cf057f828cd85f3c38ac669 (patch) | |
tree | d89ba9b33007534e6f92823efc2f667d004beb5b /connectivity | |
parent | 25276df12abd9d002f7f899900434617b256f745 (diff) |
tdf#134526 Firebird: upgrade to release 3.0.11
- Removed unneeded patches [1][2][3][4].
- No changes of ODS version.
- Added patch to revert upstream commits to avoid CppunitTest_dbaccess_firebird_test,
CppunitTest_dbaccess_hsql_binary_import, CppunitTest_dbaccess_tdf119625
and CppunitTest_dbaccess_tdf126268 failing when building on Windows.
[1] "extern/cloop: Missing dependencies of compilations on output directories"
<https://github.com/FirebirdSQL/firebird/pull/6948>
[2] "Fix checks for null HANDLE in Windows-only code"
<https://github.com/FirebirdSQL/firebird/pull/301>
[3] "Fix warning on Win64 build"
<https://github.com/FirebirdSQL/firebird/pull/231>
[4] "Mac sandbox" <https://github.com/FirebirdSQL/firebird/pull/308>
Change-Id: I17aa4938e41bfc070317fbb92ccea10f2db4d24d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152016
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/inc/pch/precompiled_firebird_sdbc.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/connectivity/inc/pch/precompiled_firebird_sdbc.hxx b/connectivity/inc/pch/precompiled_firebird_sdbc.hxx index bd628cf76a9a..7860e0b4af4e 100644 --- a/connectivity/inc/pch/precompiled_firebird_sdbc.hxx +++ b/connectivity/inc/pch/precompiled_firebird_sdbc.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-03-08 13:12:28 using: + Generated on 2023-10-28 10:48:29 using: ./bin/update_pch connectivity firebird_sdbc --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -30,22 +30,24 @@ #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> -#include <osl/file.h> #include <osl/file.hxx> #include <osl/mutex.hxx> #include <osl/process.h> #include <osl/thread.h> -#include <osl/time.h> #include <rtl/alloc.h> #include <rtl/bootstrap.hxx> +#include <rtl/character.hxx> +#include <rtl/math.h> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> +#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/log.hxx> #include <sal/types.h> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <com/sun/star/embed/ElementModes.hpp> +#include <com/sun/star/io/XStream.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> @@ -59,10 +61,11 @@ #include <com/sun/star/uno/Reference.hxx> #include <comphelper/comphelperdllapi.h> #include <comphelper/sequence.hxx> +#include <comphelper/servicehelper.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> #include <resource/sharedresources.hxx> -#include <unotools/localfilehelper.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #include <TConnection.hxx> |