|
From: <kin...@us...> - 2003-12-16 01:22:51
|
Update of /cvsroot/teem/teem/src/air In directory sc8-pr-cvs1:/tmp/cvs-serv12578 Modified Files: air.h Log Message: fix for M_PI et al on Windows for NrrdIO Index: air.h =================================================================== RCS file: /cvsroot/teem/teem/src/air/air.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** air.h 1 Dec 2003 09:21:19 -0000 1.29 --- air.h 16 Dec 2003 01:22:48 -0000 1.30 *************** *** 40,49 **** #ifdef _WIN32 - /* ---- BEGIN non-NrrdIO */ #if _MSC_VER < 1300 || !defined(_USE_MATH_DEFINES) #define M_PI 3.14159265358979323846 #define M_E 2.71828182845904523536 #endif ! /* ---- END non-NrrdIO */ typedef signed __int64 airLLong; typedef unsigned __int64 airULLong; --- 40,50 ---- #ifdef _WIN32 #if _MSC_VER < 1300 || !defined(_USE_MATH_DEFINES) #define M_PI 3.14159265358979323846 #define M_E 2.71828182845904523536 #endif ! #endif ! ! #ifdef _WIN32 && !defined(__CYGWIN__) typedef signed __int64 airLLong; typedef unsigned __int64 airULLong; |