From 20a75b9c9ebae3792574329527974088c306d3c8 Mon Sep 17 00:00:00 2001 From: James Turner Date: Sat, 7 Aug 2010 16:28:39 +0100 Subject: [PATCH] Change how certain constants are (re-)defined, to avoid warning when PLIB sg.h is included. --- simgear/constants.h | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/simgear/constants.h b/simgear/constants.h index 5da9c9a6..0356af7a 100644 --- a/simgear/constants.h +++ b/simgear/constants.h @@ -36,18 +36,20 @@ // Make sure PI is defined in its various forms +#ifndef SGD_PI // remove me once FlightGear no longer uses PLIB + #ifdef M_PI -#define SGD_PI M_PI -#define SG_PI M_PI +const double SGD_PI = M_PI; +const float SG_PI = M_PI; #else -#define SG_PI 3.1415926535f -#define SGD_PI 3.1415926535 +const float SG_PI = 3.1415926535f; +const double SGD_PI = 3.1415926535; #endif - +#endif // of PLIB-SG guard /** 2 * PI */ -#define SGD_2PI SGD_PI * 2.0 +const double SGD_2PI = SGD_PI * 2.0; /** PI / 2 */ #ifdef M_PI_2 @@ -57,14 +59,17 @@ #endif /** PI / 4 */ -#define SGD_PI_4 0.78539816339744830961 +const double SGD_PI_4 = 0.78539816339744830961; + +#ifndef SGD_DEGREES_TO_RADIANS // // remove me once FlightGear no longer uses PLIB +const double SGD_DEGREES_TO_RADIANS = SGD_PI / 180.0; +const double SGD_RADIANS_TO_DEGREES = 180.0 / SGD_PI; -#define SGD_DEGREES_TO_RADIANS (SGD_PI/180.0) -#define SGD_RADIANS_TO_DEGREES (180.0/SGD_PI) +const float SG_DEGREES_TO_RADIANS = SG_PI / 180.0f; +const float SG_RADIANS_TO_DEGREES = 180.0f / SG_PI; -#define SG_DEGREES_TO_RADIANS SGD_DEGREES_TO_RADIANS -#define SG_RADIANS_TO_DEGREES SGD_RADIANS_TO_DEGREES +#endif // of PLIB-SG guard /** \def SG_E "e" */ #ifdef M_E -- 2.39.5