|
From: <kin...@us...> - 2004-02-19 06:55:23
|
Update of /cvsroot/teem/teem/src/air In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16501/air Modified Files: air.h miscAir.c Log Message: going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows Index: air.h =================================================================== RCS file: /cvsroot/teem/teem/src/air/air.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** air.h 14 Feb 2004 18:56:54 -0000 1.38 --- air.h 19 Feb 2004 06:45:11 -0000 1.39 *************** *** 50,60 **** # pragma warning ( disable : 4309 ) # pragma warning ( disable : 4273 ) - /* add essential math definitions */ - # ifndef M_PI - # define M_PI 3.14159265358979323846 - # endif - # ifndef M_E - # define M_E 2.71828182845904523536 - # endif #endif --- 50,53 ---- *************** *** 75,78 **** --- 68,75 ---- #endif + /* This is annoying, thanks to windows */ + #define AIR_PI 3.14159265358979323846 + #define AIR_E 2.71828182845904523536 + #define AIR_STRLEN_SMALL (128+1) #define AIR_STRLEN_MED (256+1) Index: miscAir.c =================================================================== RCS file: /cvsroot/teem/teem/src/air/miscAir.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** miscAir.c 13 Feb 2004 18:46:51 -0000 1.21 --- miscAir.c 19 Feb 2004 06:45:11 -0000 1.22 *************** *** 483,487 **** x = x - mean; ! return exp(-(x*x)/(2*stdv*stdv))/(stdv*sqrt(2*M_PI)); } --- 483,487 ---- x = x - mean; ! return exp(-(x*x)/(2*stdv*stdv))/(stdv*sqrt(2*AIR_PI)); } |