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

[Stephan Bergmann]

 external/firebird/UnpackedTarball_firebird.mk |    1 +
 external/firebird/libc++.patch                |   11 +++++++++++
 2 files changed, 12 insertions(+)

New commits:
commit 183b2ff719364a17f1f21d7ba445e12c55d94871
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 5 20:38:08 2016 +0200

    external/firebird: Fix isinf-check for libc++
    
    ...which, at least since version 3.9, defines isinf only as a function, not as a
    macro, in math.h
    
    Change-Id: I7939d5bebe4b55ac7bd36bb321ad0020352a0e7b

diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index 0e9277a..b65d041 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 		external/firebird/firebird-gcc6.patch.1 \
 		external/firebird/wnt-dbgutil.patch \
 		external/firebird/debug-gfix-failure.patch \
+		external/firebird/libc++.patch \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/libc++.patch b/external/firebird/libc++.patch
new file mode 100644
index 0000000..270c077
--- /dev/null
+++ b/external/firebird/libc++.patch
@@ -0,0 +1,11 @@
+--- src/common/classes/FpeControl.h
++++ src/common/classes/FpeControl.h
+@@ -222,7 +222,7 @@
+ {
+ 	return (!_finite (x) && !isnan(x));
+ }
+-#else
++#elif !defined _LIBCPP_VERSION || _LIBCPP_VERSION < 3900
+ #ifndef isinf
+ template <typename F>
+ inline bool isinf(F x)