diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-01-19 14:53:57 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-01-19 21:53:07 +0100 |
| commit | c799f159c541fe4835eb02c2e518b54a55d392bb (patch) | |
| tree | f03f6af557d24e2418d347a0ad160f4fdf8bab28 | |
| parent | 0c3838bd080b47c935f26aed23d6c086fa87b27c (diff) | |
firebird: recognise MSVC 2017.5 (which defines _MSC_VER=1912)
Change-Id: Ic526bc3babfd342fd2ebb10003639d600a668ae5
| -rw-r--r-- | external/firebird/firebird-vs2017.patch.1 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/external/firebird/firebird-vs2017.patch.1 b/external/firebird/firebird-vs2017.patch.1 index b1d6b1b6b49e..7d140589c881 100644 --- a/external/firebird/firebird-vs2017.patch.1 +++ b/external/firebird/firebird-vs2017.patch.1 @@ -1,13 +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,8 @@ "msvcr120.dll", #elif _MSC_VER == 1900 "vcruntime140.dll", -+#elif _MSC_VER == 1910 -+ "vcruntime140.dll", -+#elif _MSC_VER == 1911 ++#elif _MSC_VER == 1910 || _MSC_VER == 1911 || _MSC_VER == 1912 + "vcruntime140.dll", #else #error Specify CRT DLL name here ! |