From 6e662fe4d6d26732244aa6631bc0bef5d484962f Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Fri, 4 May 2012 23:24:10 +0200 Subject: [PATCH] Ganael Laplanche: fix include dependencies for FreeBSD support --- simgear/misc/sg_dir.cxx | 1 + simgear/props/condition.cxx | 8 ++++---- simgear/props/propertyObject_test.cxx | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/simgear/misc/sg_dir.cxx b/simgear/misc/sg_dir.cxx index 7d26025b..c575c053 100644 --- a/simgear/misc/sg_dir.cxx +++ b/simgear/misc/sg_dir.cxx @@ -42,6 +42,7 @@ #include #include +#include #include using std::string; diff --git a/simgear/props/condition.cxx b/simgear/props/condition.cxx index d60cb440..363b9f46 100644 --- a/simgear/props/condition.cxx +++ b/simgear/props/condition.cxx @@ -297,19 +297,19 @@ doComparison (const SGPropertyNode * left, const SGPropertyNode * right, const S } case props::INT: return doComp(left->getIntValue(), right->getIntValue(), - precision ? abs(precision->getIntValue()/2) : 0 ); + precision ? std::abs(precision->getIntValue()/2) : 0 ); case props::LONG: return doComp(left->getLongValue(), right->getLongValue(), - precision ? abs(precision->getLongValue()/2L) : 0L ); + precision ? std::abs(precision->getLongValue()/2L) : 0L ); case props::FLOAT: return doComp(left->getFloatValue(), right->getFloatValue(), - precision ? fabs(precision->getFloatValue()/2.0f) : 0.0f ); + precision ? std::fabs(precision->getFloatValue()/2.0f) : 0.0f ); case props::DOUBLE: return doComp(left->getDoubleValue(), right->getDoubleValue(), - precision ? fabs(precision->getDoubleValue()/2.0) : 0.0 ); + precision ? std::fabs(precision->getDoubleValue()/2.0) : 0.0 ); case props::STRING: case props::NONE: diff --git a/simgear/props/propertyObject_test.cxx b/simgear/props/propertyObject_test.cxx index b366d27a..c09292e7 100644 --- a/simgear/props/propertyObject_test.cxx +++ b/simgear/props/propertyObject_test.cxx @@ -12,6 +12,7 @@ #include #include +#include #include // working around MSVC weirdness with props.hxx and SGMathFwd -- 2.39.5