Index: mttroot/mtt/cc/include/useful-functions.hh ================================================================== --- mttroot/mtt/cc/include/useful-functions.hh +++ mttroot/mtt/cc/include/useful-functions.hh @@ -1,6 +1,6 @@ -#define pi 3.14159 // Predefine pi +//#define pi 3.14159 // Predefine pi #ifndef HAVE_USEFUL_FUNCTIONS_HH #define HAVE_USEFUL_FUNCTIONS_HH Index: mttroot/mtt/lib/reduce/fix_c.r ================================================================== --- mttroot/mtt/lib/reduce/fix_c.r +++ mttroot/mtt/lib/reduce/fix_c.r @@ -1,6 +1,9 @@ %% Fixes for c-code generation + +%% Set PI explicitly here to avoid later conflict with cc headers +LET PI = 3.1415$ ON ROUNDED$ % No integer output %% Changes x^y to pow(x,y) OPERATOR pow$ @@ -14,7 +17,8 @@ FOR ALL x LET pow(x,0) = 1$ FOR ALL x LET pow(x,1) = x$ OPERATOR fabs$ FOR ALL x let abs(x) = fabs(x)$ + END$