From 58d6310979fe73101cf88dba1cf9de885e58af2d Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Mon, 26 Nov 2007 23:22:41 +0000
Subject: [PATCH] Added #ifdef around MAX definition to avoid compiler warnings

---
 core/net/rime/ipolite.c | 4 +++-
 core/net/rime/polite.c  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/net/rime/ipolite.c b/core/net/rime/ipolite.c
index 8e765259e..175af4ad0 100644
--- a/core/net/rime/ipolite.c
+++ b/core/net/rime/ipolite.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ipolite.c,v 1.2 2007/09/14 20:26:52 nvt-se Exp $
+ * $Id: ipolite.c,v 1.3 2007/11/26 23:22:41 adamdunkels Exp $
  */
 
 /**
@@ -49,7 +49,9 @@
 
 #include <string.h>
 
+#ifndef MAX
 #define MAX(a,b) ((a)>(b)?(a):(b))
+#endif /* MAX */
 
 /*---------------------------------------------------------------------------*/
 static void
diff --git a/core/net/rime/polite.c b/core/net/rime/polite.c
index 38bbd4032..637fc264a 100644
--- a/core/net/rime/polite.c
+++ b/core/net/rime/polite.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: polite.c,v 1.2 2007/10/19 13:50:01 nifi Exp $
+ * $Id: polite.c,v 1.3 2007/11/26 23:22:41 adamdunkels Exp $
  */
 
 /**
@@ -49,7 +49,9 @@
 
 #include <string.h>
 
+#ifndef MAX
 #define MAX(a,b) ((a)>(b)?(a):(b))
+#endif /* MAX */
 
 /*---------------------------------------------------------------------------*/
 static void