[Libreoffice-commits] core.git: external/firebird

[Libreoffice Gerrit user]

 external/firebird/firebird-vs2017.patch.1 |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit b3b5abf3fdb0e088f6b902a22c3434e7176513c1
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Aug 15 14:00:56 2018 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Aug 15 18:20:57 2018 +0200

    Allow all _MSC_VER up to (excluding) 2000 (Firebird)
    
    (see https://blogs.msdn.microsoft.com/vcblog/2016/10/05/visual-c-compiler-version/)
    
    Change-Id: I69133a3742f72c20daa0ad94e093e4fffbd5d8c2
    Reviewed-on: https://gerrit.libreoffice.org/59097
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/external/firebird/firebird-vs2017.patch.1 b/external/firebird/firebird-vs2017.patch.1
index a4dad62e34a9..609f380a3e46 100644
--- a/external/firebird/firebird-vs2017.patch.1
+++ b/external/firebird/firebird-vs2017.patch.1
@@ -4,9 +4,8 @@ diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp firebird/src/common/os
 @@ -103,6 +103,6 @@
  					"msvcr120.dll",
 -#elif _MSC_VER == 1900
--					"vcruntime140.dll",
-+#elif _MSC_VER >= 1900 && _MSC_VER <= 1914
-+					"vcruntime140.dll",
++#elif _MSC_VER >= 1900 && _MSC_VER < 2000
+ 					"vcruntime140.dll",
  #else
                      #error Specify CRT DLL name here !
  #endif