From 09ec3af3371020278d5c41ca19e170468dc2fc02 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Fri, 6 Dec 2019 10:52:38 +0100 Subject: [PATCH] libcom: fix colliding isnan/isinf between C99 and C++0x for gcc-4 This fix can be removed once support for gcc-4 is dropped in 2038 --- src/libCom/osi/os/posix/epicsMath.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libCom/osi/os/posix/epicsMath.h b/src/libCom/osi/os/posix/epicsMath.h index 13f25e520..1ef96d76f 100644 --- a/src/libCom/osi/os/posix/epicsMath.h +++ b/src/libCom/osi/os/posix/epicsMath.h @@ -18,8 +18,10 @@ #include using std::isfinite; +#ifndef __GXX_EXPERIMENTAL_CXX0X__ using std::isinf; using std::isnan; +#endif using std::isnormal; extern "C" {