external/firebird/firebird-vs2017.patch.1 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit bbff9949f9c22daf1921b5680121102e4bd422ab
Author: himajin100000 <himajin100...@gmail.com>
Date: Thu Mar 29 03:09:08 2018 +0900
Suppport _MSC_VER 1913 and 1914(Firebird)
Change-Id: Ifeab9119fcc1037365251cd49dd7714cc37b3012
Reviewed-on: https://gerrit.libreoffice.org/52164
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
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 !
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
