From c645cad175e76d6859cfae9f3e70ca742cf4f7c9 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Thu, 15 Nov 2007 08:10:42 +0000
Subject: [PATCH] fixed conflicting types: nbh.c vs nbh.h

---
 core/net/rime/nbh.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/net/rime/nbh.c b/core/net/rime/nbh.c
index ede880e5e..257a27d94 100644
--- a/core/net/rime/nbh.c
+++ b/core/net/rime/nbh.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: nbh.c,v 1.1 2007/11/13 21:01:54 adamdunkels Exp $
+ * $Id: nbh.c,v 1.2 2007/11/15 08:10:42 fros4943 Exp $
  */
 
 /**
@@ -139,7 +139,7 @@ static const struct ibc_callbacks ibc_callbacks =
   {adv_packet_received};
 /*---------------------------------------------------------------------------*/
 void
-nbh_open(struct nbh_conn *c, u16_t channel,
+nbh_open(struct nbh_conn *c, uint16_t channel,
 	 const struct nbh_callbacks *cb)
 {
   ibc_open(&c->c, channel, &ibc_callbacks);
@@ -154,7 +154,7 @@ nbh_close(struct nbh_conn *c)
 }
 /*---------------------------------------------------------------------------*/
 void
-nbh_start(struct nbh_conn *c, u16_t val)
+nbh_start(struct nbh_conn *c, uint16_t val)
 {
   c->val = val;
   ctimer_set(&c->t, random_rand() % MIN_INTERVAL, send_timer, c);