diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-09-07 15:39:49 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-07 20:54:02 +0200 |
| commit | 5ffe8f05590e43eb8a668bb6da1f2e2ce0a7f713 (patch) | |
| tree | 7ec5cf0ea8575f340099880217cf3963b2001934 /external | |
| parent | 4b56d76e83fe062e39f5c00fa405f2a14a13b7ca (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>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/firebird-vs2017.patch.1 | 4 |
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 |