summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2017-09-07 15:39:49 +0200
committerAndras Timar <andras.timar@collabora.com>2021-05-10 13:40:03 +0200
commit2da5ff33dc1aa37003c573ae31c1d8bc022673bc (patch)
tree893c0159e80a2ebfbb4fab926f8972670c6fe2fa
parente34f86efb64240937dad99ff5f629fd1c6bb8bc7 (diff)
Fix firebird build with MSVC update 15.3
Change-Id: I236f182fd99e19e4ea171ad1bae6c03f1a258c7e Reviewed-on: https://gerrit.libreoffice.org/42060 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--external/firebird/firebird-vs2017.patch.14
1 files changed, 3 insertions, 1 deletions
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,12 +1,14 @@
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 !
#endif