comparison system/System.h @ 188:56c167f3648a

compilation under linux: resolve bug with std::min

     COPYING included with this distribution for more information.
 */
 
 #ifndef _SYSTEM_H_
 #define _SYSTEM_H_
+
+//#include <cmath>
 
 #ifdef _WIN32
 
 #include <windows.h>
 #include <malloc.h>

 
 #endif /* __APPLE__ */
 
 #endif /* ! _WIN32 */
 
+#include <cmath>
+#include <algorithm>
+
 #ifdef __GNUC__
 
-#ifndef min  
-#define  min(x)  std::min((x)) 
-#endif
-
-#ifndef max
-#define  max(x)  std::max((x)) 
+#ifndef MIN  
+#define  MIN(x, y)  std::min(x, y) 
+#endif
+
+#ifndef MAX
+#define  MAX(x, y)  std::max(x, y) 
 #endif
 
 #ifndef isnan  
 #define  isnan(x)  std::isnan((x)) 
 #endif

 
 // Return a vague approximation to the number of free megabytes of disc space
 // on the partition containing the given path.  Return -1 if unknown.
 extern int GetDiscSpaceMBAvailable(const char *path);
 
-#include <cmath>
+//#include <cmath>
 
 extern double mod(double x, double y);
 extern float modf(float x, float y);
 
 extern double princarg(double a);