From 75e1c0c8c726357c9bd70b858a6a6d9294b49fe0 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Wed, 3 Feb 2010 16:45:12 +0000
Subject: [PATCH] Include contiki-conf.h to let the MAC channel check rate be
 configurable

---
 core/net/mac/mac.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/net/mac/mac.h b/core/net/mac/mac.h
index d0d8409b3..4d6344ac3 100644
--- a/core/net/mac/mac.h
+++ b/core/net/mac/mac.h
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: mac.h,v 1.10 2010/02/03 01:17:32 adamdunkels Exp $
+ * $Id: mac.h,v 1.11 2010/02/03 16:45:12 adamdunkels Exp $
  */
 
 /**
@@ -41,6 +41,7 @@
 #ifndef __MAC_H__
 #define __MAC_H__
 
+#include "contiki-conf.h"
 #include "dev/radio.h"
 
 /**
@@ -92,11 +93,12 @@ enum {
      error will be fatal then as well. */
   MAC_TX_ERR_FATAL,
 };
-
+#ifndef MAC_CHANNEL_CHECK_RATE
 #ifdef MAC_CONF_CHANNEL_CHECK_RATE
 #define MAC_CHANNEL_CHECK_RATE MAC_CONF_CHANNEL_CHECK_RATE
-#else /* MAC_CHANNEL_CHECK_RATE */
+#else /* MAC_CONF_CHANNEL_CHECK_RATE */
 #define MAC_CHANNEL_CHECK_RATE 4
+#endif /* MAC_CONF_CHANNEL_CHECK_RATE */
 #endif /* MAC_CHANNEL_CHECK_RATE */
 
 #if (MAC_CHANNEL_CHECK_RATE & (MAC_CHANNEL_CHECK_RATE - 1)) != 0