diff options
| author | Wastack <btomi96@gmail.com> | 2016-07-28 17:16:19 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2016-08-17 13:05:40 +0000 |
| commit | 45f42681f4d1260c42140a313560534e605f81a4 (patch) | |
| tree | 1c51f2ba29261c38a3e771dc04968f2e9cb5957f /external/firebird/firebird-c++11.patch.1 | |
| parent | writerfilter: fix Android build (diff) | |
| download | core-45f42681f4d1260c42140a313560534e605f81a4.tar.gz core-45f42681f4d1260c42140a313560534e605f81a4.zip | |
GSoC Upgrade firebird to 3.0
Embedded firebird is now version 3.0.
Supports MSVC 14.0.
Instead of fbembed, there are now two libraries: fbclient and
Engine12. fbclient is linked as fbembed before, Engine12 is loaded
at runtime from fbclient.
fb now needs system libtommath, which is supplied
as a new ExternalProject of LO.
Change-Id: I132939bdee745795b22f675e4265e9590079c45f
Reviewed-on: https://gerrit.libreoffice.org/27642
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (limited to 'external/firebird/firebird-c++11.patch.1')
| -rw-r--r-- | external/firebird/firebird-c++11.patch.1 | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/external/firebird/firebird-c++11.patch.1 b/external/firebird/firebird-c++11.patch.1 deleted file mode 100644 index 8f22616862e0..000000000000 --- a/external/firebird/firebird-c++11.patch.1 +++ /dev/null @@ -1,27 +0,0 @@ -# -*- Mode: Diff -*- ---- firebird/src/dudley/exe.epp -+++ firebird/src/dudley/exe.epp -@@ -2884,9 +2884,9 @@ - blr_parameter, 0, 0, 0, - blr_parameter, 0, 1, 0, - blr_parameter, 1, 0, 0, -- blr_end, -- blr_end, -- blr_end, -+ SCHAR(blr_end), -+ SCHAR(blr_end), -+ SCHAR(blr_end), - blr_eoc - }; - static FB_API_HANDLE req_handle; ---- firebird/src/gpre/sqe.cpp -+++ firebird/src/gpre/sqe.cpp -@@ -2529,7 +2529,7 @@ - return par_stat(request); - - if (MSC_match(KW_MINUS)) -- return MSC_unary(nod_negate, par_primitive_value(request, false, paren_count, false)); -+ return MSC_unary(nod_negate, par_primitive_value(request, false, paren_count, NULL)); - - MSC_match(KW_PLUS); - |