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

[David Ostrovsky]

 external/firebird/UnpackedTarball_firebird.mk |    1 +
 external/firebird/firebird-vs2017.patch.1     |   12 ++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 3e1e49561bb734475d2b7d1db1beef0d3e9b53cd
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Wed Feb 15 22:31:00 2017 +0100

    Fix firebird MSVC 15.0 detection
    
    Change-Id: I9721632c68e6428b03b0368e7802c6eb4f5eb0a2
    Reviewed-on: https://gerrit.libreoffice.org/34323
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>

diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index 3cd7a42..29395c0 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 	external/firebird/firebird-cygwin-msvc.patch \
+	external/firebird/firebird-vs2017.patch.1 \
 ))
 endif
 
diff --git a/external/firebird/firebird-vs2017.patch.1 b/external/firebird/firebird-vs2017.patch.1
new file mode 100644
index 0000000..ba747b3
--- /dev/null
+++ b/external/firebird/firebird-vs2017.patch.1
@@ -0,0 +1,12 @@
+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 @@
+ 					"msvcr120.dll",
+ #elif _MSC_VER == 1900
+ 					"vcruntime140.dll",
++#elif _MSC_VER == 1910
++					"vcruntime140.dll",
+ #else
+                     #error Specify CRT DLL name here !
+ #endif