From e1787879994b117a57635c12562cc046c8e4853e Mon Sep 17 00:00:00 2001
From: Adam Dunkels <adam@thingsquare.com>
Date: Tue, 20 Nov 2012 21:15:55 +0100
Subject: [PATCH] Fixed compilation problems on the micaz and exp5438 platforms
 due to the node-id change

---
 platform/exp5438/contiki-exp5438-main.c | 2 ++
 platform/micaz/node-id.c                | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/exp5438/contiki-exp5438-main.c b/platform/exp5438/contiki-exp5438-main.c
index f4369f0b8..662243444 100644
--- a/platform/exp5438/contiki-exp5438-main.c
+++ b/platform/exp5438/contiki-exp5438-main.c
@@ -67,6 +67,8 @@
 #define PRINTF(...)
 #endif
 
+extern unsigned char node_mac[8];
+
 //SENSORS(&button_sensor);
 /*---------------------------------------------------------------------------*/
 #ifndef RF_CHANNEL
diff --git a/platform/micaz/node-id.c b/platform/micaz/node-id.c
index 84118cb40..00f1ed13a 100644
--- a/platform/micaz/node-id.c
+++ b/platform/micaz/node-id.c
@@ -31,9 +31,10 @@
  * @(#)$$
  */
 
+#include "contiki-conf.h"
 #include "sys/node-id.h"
 
-uint16_t node_id = 0;
+unsigned short node_id = 0;
 
 /*---------------------------------------------------------------------------*/
 void
@@ -50,7 +51,7 @@ node_id_restore(void)
 }
 /*---------------------------------------------------------------------------*/
 void
-node_id_burn(uint16_t id)
+node_id_burn(unsigned short id)
 {
   uint16_t buffer[2] = { 0xdead, id };
   uint8_t volatile sreg;