Changeset 3682 for branches

Timestamp:

Mar 14, 2011, 10:45:33 PM (14 years ago)

Author:

bird

Message:

0.6: Backported 3670: sys/param.h: MIN & MAX fixes for gcc 4.2.0 and later. Fixes #203.

File:

• branches/libc-0.6/src/emx/include/sys/param.h (modified) (1 diff)

branches/libc-0.6/src/emx/include/sys/param.h

@@ -202 +202 @@
 #endif
 
-#if defined (__cplusplus) && (__GNUC__ >= 2)
-#  define MIN(a,b) (((a)<?(b))
+/*
+ * minimum and maximum macros. Use available g++ tricks.
+ */
+#if defined(__cplusplus) && (__GNUC__ >= 2) && (__GNUC__ <= 3)
+# define MIN(a, b)      ( (a) <? (b) )
+# define MAX(a, b)      ( (a) >? (b) )
 #else
-#  define MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-#if defined (__cplusplus) && (__GNUC__ >= 2)
-#  define MAX(a,b) (((a)>?(b))
-#else
-#  define MAX(a,b) (((a)>(b))?(a):(b))
+# define MIN(a, b)      ( (a) < (b) ? (a) : (b) )
+# define MAX(a, b)      ( (a) > (b) ? (a) : (b) )
 #endif