diff options
| author | himajin100000 <himajin100000@gmail.com> | 2018-03-29 03:09:08 +0900 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-31 22:11:35 +0200 |
| commit | bbff9949f9c22daf1921b5680121102e4bd422ab (patch) | |
| tree | 9d04b75dba55d9b4577df0b19052d10ddbad49bb /external | |
| parent | a3c9d29cdb8d83ce060b5ddc96ef1463ea32350c (diff) | |
Suppport _MSC_VER 1913 and 1914(Firebird)
Change-Id: Ifeab9119fcc1037365251cd49dd7714cc37b3012
Reviewed-on: https://gerrit.libreoffice.org/52164
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/firebird-vs2017.patch.1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/external/firebird/firebird-vs2017.patch.1 b/external/firebird/firebird-vs2017.patch.1 index 7d140589c881..a4dad62e34a9 100644 --- a/external/firebird/firebird-vs2017.patch.1 +++ b/external/firebird/firebird-vs2017.patch.1 @@ -1,11 +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,8 @@ +@@ -103,6 +103,6 @@ "msvcr120.dll", - #elif _MSC_VER == 1900 - "vcruntime140.dll", -+#elif _MSC_VER == 1910 || _MSC_VER == 1911 || _MSC_VER == 1912 +-#elif _MSC_VER == 1900 +- "vcruntime140.dll", ++#elif _MSC_VER >= 1900 && _MSC_VER <= 1914 + "vcruntime140.dll", #else #error Specify CRT DLL name here ! |