[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - external/firebird

[Mike Kaganski]

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

New commits:
commit a746fb861638918ebfa7aa2be4781e6948bc3587
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Mon Apr 23 09:22:01 2018 +0100

    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 at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

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