From a85b9877442762bfa6dc4141acd0d6556dcfbb4a Mon Sep 17 00:00:00 2001 From: Bartok9 Date: Sun, 26 Jul 2026 05:22:38 -0400 Subject: [PATCH] fix(airlib): protect MultirotorApiBase std::max from Windows macros Same (std::max) form as SafetyEval so NOMINMAX-less Windows builds compile. --- AirLib/src/vehicles/multirotor/api/MultirotorApiBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AirLib/src/vehicles/multirotor/api/MultirotorApiBase.cpp b/AirLib/src/vehicles/multirotor/api/MultirotorApiBase.cpp index 3329798373..8a7b752609 100644 --- a/AirLib/src/vehicles/multirotor/api/MultirotorApiBase.cpp +++ b/AirLib/src/vehicles/multirotor/api/MultirotorApiBase.cpp @@ -918,7 +918,7 @@ namespace airlib //if auto mode requested for lookahead then calculate based on velocity float command_period_dist = velocity * getCommandPeriod(); float lookahead = command_period_dist * (adaptive_lookahead > 0 ? min_factor : max_factor); - lookahead = std::max(lookahead, getDistanceAccuracy() * 1.5f); //50% more than distance accuracy + lookahead = (std::max)(lookahead, getDistanceAccuracy() * 1.5f); //50% more than distance accuracy (paren form: Windows min/max macros) return lookahead; }