[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-5-4-7-2' - external/firebird

[Szymon KÅ‚os (via logerrit)]

 external/firebird/firebird-vs2017.patch.1 |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2da5ff33dc1aa37003c573ae31c1d8bc022673bc
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Sep 7 15:39:49 2017 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 10 13:40:03 2021 +0200

    Fix firebird build with MSVC update 15.3
    
    Change-Id: I236f182fd99e19e4ea171ad1bae6c03f1a258c7e
    Reviewed-on: https://gerrit.libreoffice.org/42060
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/firebird/firebird-vs2017.patch.1 b/external/firebird/firebird-vs2017.patch.1
index ba747b3470f4..b1d6b1b6b49e 100644
--- a/external/firebird/firebird-vs2017.patch.1
+++ b/external/firebird/firebird-vs2017.patch.1
@@ -1,11 +1,13 @@
 diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp firebird/src/common/os/win32/mod_loader.cpp
 --- firebird.orig/src/common/os/win32/mod_loader.cpp	2017-02-15 22:11:48.939042400 +0100
 +++ firebird/src/common/os/win32/mod_loader.cpp	2017-02-15 22:12:30.062262700 +0100
-@@ -103,6 +103,8 @@
+@@ -103,6 +103,10 @@
  					"msvcr120.dll",
  #elif _MSC_VER == 1900
  					"vcruntime140.dll",
 +#elif _MSC_VER == 1910
++					"vcruntime140.dll",
++#elif _MSC_VER == 1911
 +					"vcruntime140.dll",
  #else
                      #error Specify CRT DLL name here !