wok-next view jsoncpp/stuff/patches/0001-json_writer-fix-build-with-glibc-2.26.patch @ rev 20959
Fix minicom
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Thu Sep 06 11:27:41 2018 +0200 (2018-09-06) |
| parents | |
| children |
line source
1 From 2cb87c456f95510d55dd40f783435ecd1177c453 Mon Sep 17 00:00:00 2001
2 From: Romain Naour <romain.naour@gmail.com>
3 Date: Sat, 26 Aug 2017 19:39:03 +0200
4 Subject: [PATCH] json_writer: fix build with glibc >= 2.26
6 src/lib_json/json_writer.cpp:45:23: error: 'isfinite' is not a member of 'std'
7 #define isfinite std::isfinite
8 ^
10 Signed-off-by: Romain Naour <romain.naour@gmail.com>
11 ---
12 src/lib_json/json_writer.cpp | 3 +++
13 1 file changed, 3 insertions(+)
15 diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
16 index 02f1cb1..a3189cb 100644
17 --- a/src/lib_json/json_writer.cpp
18 +++ b/src/lib_json/json_writer.cpp
19 @@ -42,9 +42,12 @@
20 #else
21 #include <cmath>
22 #if !(defined(__QNXNTO__)) // QNX already defines isfinite
23 +// std::isfinite is not defined on glibc >= 2.26
24 +#if !(defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 26)))
25 #define isfinite std::isfinite
26 #endif
27 #endif
28 +#endif
30 #if defined(_MSC_VER)
31 #if !defined(WINCE) && defined(__STDC_SECURE_LIB__) && _MSC_VER >= 1500 // VC++ 9.0 and above
32 --
33 2.9.5