diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-23 09:22:01 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-04-23 16:49:44 +0200 |
| commit | a746fb861638918ebfa7aa2be4781e6948bc3587 (patch) | |
| tree | c442c22669abbe76a4673bdd0767ea51287b1593 /external | |
| parent | 7482eeb97d1647f0c39ebb0b5351aebc71a2e428 (diff) | |
Suppport _MSC_VER 1900 through (less then) 2000 (Firebird)
(see https://gerrit.libreoffice.org/52164 for master)
(see https://blogs.msdn.microsoft.com/vcblog/2016/10/05/visual-c-compiler-version/)
Change-Id: I7e67d9d53b66251ba1dab34815412fbba7f8e6b1
Reviewed-on: https://gerrit.libreoffice.org/53311
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/firebird-vs2017.patch.1 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/external/firebird/firebird-vs2017.patch.1 b/external/firebird/firebird-vs2017.patch.1 index b1d6b1b6b49e..609f380a3e46 100644 --- a/external/firebird/firebird-vs2017.patch.1 +++ b/external/firebird/firebird-vs2017.patch.1 @@ -1,14 +1,11 @@ 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,10 @@ +@@ -103,6 +103,6 @@ "msvcr120.dll", - #elif _MSC_VER == 1900 +-#elif _MSC_VER == 1900 ++#elif _MSC_VER >= 1900 && _MSC_VER < 2000 "vcruntime140.dll", -+#elif _MSC_VER == 1910 -+ "vcruntime140.dll", -+#elif _MSC_VER == 1911 -+ "vcruntime140.dll", #else #error Specify CRT DLL name here ! #endif |