From: david Date: Thu, 11 Apr 2002 19:09:15 +0000 (+0000) Subject: Get rid of non-portable fmax call. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f17a6479f70b9ce170f963b284c4c115755f688d;p=flightgear.git Get rid of non-portable fmax call. --- diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx index fd8259f22..27b40ab83 100644 --- a/src/FDM/JSBSim/JSBSim.cxx +++ b/src/FDM/JSBSim/JSBSim.cxx @@ -58,6 +58,13 @@ #include #include "JSBSim.hxx" +static inline double +FMAX (double a, double b) +{ + return a > b ? a : b; +} + + /******************************************************************************/ FGJSBsim::FGJSBsim( double dt ) @@ -332,8 +339,8 @@ bool FGJSBsim::copy_to_JSBsim() { // Parking brake sets minimum braking // level for mains. double parking_brake = globals->get_controls()->get_parking_brake(); - FCS->SetLBrake(fmax(globals->get_controls()->get_brake(0), parking_brake)); - FCS->SetRBrake(fmax(globals->get_controls()->get_brake(1), parking_brake)); + FCS->SetLBrake(FMAX(globals->get_controls()->get_brake(0), parking_brake)); + FCS->SetRBrake(FMAX(globals->get_controls()->get_brake(1), parking_brake)); FCS->SetCBrake( globals->get_controls()->get_brake( 2 ) ); FCS->SetGearCmd( globals->get_controls()->get_gear_down());