diff system/System.h @ 190:61681a2bc1e6

keep MIN and MAX compatibility (VC and linux compilation)

--- a/system/System.h	Tue Nov 27 13:11:44 2007 +0000
+++ b/system/System.h	Tue Nov 27 13:26:04 2007 +0000
@@ -30,6 +30,22 @@
 #include <math.h>
 #include <float.h>
 
+#ifndef MIN  
+#define  MIN(x, y)  min(x, y) 
+#endif
+
+#ifndef MAX
+#define  MAX(x, y)  max(x, y) 
+#endif
+
+#ifndef ISNAN  
+#define  ISNAN(x)  isnan((x)) 
+#endif
+
+#ifndef ISINF  
+#define  ISINF(x)  isinf((x)) 
+#endif
+
 typedef int WINBOOL;
 
 typedef signed char int8_t;
@@ -197,12 +213,12 @@
 #define  MAX(x, y)  std::max(x, y) 
 #endif
 
-#ifndef isnan  
-#define  isnan(x)  std::isnan((x)) 
+#ifndef ISNAN  
+#define  ISNAN(x)  std::isnan((x)) 
 #endif
 
-#ifndef isinf  
-#define  isinf(x)  std::isinf((x)) 
+#ifndef ISINF  
+#define  ISINF(x)  std::isinf((x)) 
 #endif
 
 #endif /* __GNUC__ */