From 099b24d3639cf9c04342fe1976ce5f542f9b7719 Mon Sep 17 00:00:00 2001 From: jeggermo Date: Tue, 4 Nov 2003 15:29:24 +0000 Subject: [PATCH] eoData has been changed slightly for MacOSX --- eo/src/utils/eoData.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/eo/src/utils/eoData.h b/eo/src/utils/eoData.h index 6fd9a8b5..3ede8d38 100644 --- a/eo/src/utils/eoData.h +++ b/eo/src/utils/eoData.h @@ -41,23 +41,25 @@ #else #include #include -#ifndef _WIN32 // should be the define for UN*X flavours: _POSIX?? - #include -#endif - #ifndef MAXFLOAT - #define MAXFLOAT (float)1e127 - #define MAXDOUBLE (double)1.79769313486231570e+308 - #define MAXINT 2147483647 - #endif #endif -// Added because it does not seem to be defined with Cygwin??? +#if !defined(_WIN32) && !defined(__CYGWIN__) && !(defined(__APPLE__) || defined(MACOSX)) + #include +#endif + +// for cygwin and windows (and possibly MacOsX) #ifndef MINFLOAT #define MINFLOAT ( (float)1e-127 ) #endif #ifndef MAXFLOAT #define MAXFLOAT ( (float)1e127 ) #endif +#ifndef MAXINT + #define MAXINT 2147483647 +#endif +#ifndef MAXDOUBLE + #define MAXDOUBLE (double)1.79769313486231570e+308 +#endif #ifndef _MSC_VER #include