Mercurial > ecos

diff packages/net/tcpip/current/include/sys/param.h @ 103:95f3e12a6327 ecos-sw-2000-06-23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from eCos master repository on 2000-06-23-16:41:10-BST
author jlarmour
date Fri, 23 Jun 2000 17:06:31 +0000
parents ced4577552cd
children 84e4bde58b26
line wrap: on
line diff
--- a/packages/net/tcpip/current/include/sys/param.h
+++ b/packages/net/tcpip/current/include/sys/param.h
@@ -264,8 +264,12 @@
 
 /* Macros for min/max. */
 #ifndef _KERNEL
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-#define	MAX(a,b) (((a)>(b))?(a):(b))
+# ifndef MIN
+#  define	MIN(a,b) (((a)<(b))?(a):(b))
+# endif
+# ifndef MAX
+#  define	MAX(a,b) (((a)>(b))?(a):(b))
+# endif
 #endif
 
 #ifndef __ECOS