From 2f89e69ff71c802f4caf132f5744eedcc7d90d2c Mon Sep 17 00:00:00 2001
From: oliverschmidt <oliverschmidt>
Date: Tue, 12 Oct 2010 19:51:28 +0000
Subject: [PATCH] Fixed build for platforms which use the default value for
 QUEUEBUF_NUM.

---
 core/net/queuebuf.c     | 8 +-------
 core/net/queuebuf.h     | 8 +++++++-
 core/net/rime/collect.c | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/net/queuebuf.c b/core/net/queuebuf.c
index 1c2c7a375..c4acf1c2b 100644
--- a/core/net/queuebuf.c
+++ b/core/net/queuebuf.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: queuebuf.c,v 1.3 2010/10/04 20:26:01 adamdunkels Exp $
+ * $Id: queuebuf.c,v 1.4 2010/10/12 19:51:28 oliverschmidt Exp $
  */
 
 /**
@@ -47,12 +47,6 @@
 
 #include <string.h> /* for memcpy() */
 
-#ifdef QUEUEBUF_CONF_NUM
-#define QUEUEBUF_NUM QUEUEBUF_CONF_NUM
-#else
-#define QUEUEBUF_NUM 8
-#endif
-
 #ifdef QUEUEBUF_CONF_REF_NUM
 #define QUEUEBUF_REF_NUM QUEUEBUF_CONF_REF_NUM
 #else
diff --git a/core/net/queuebuf.h b/core/net/queuebuf.h
index a8b844468..ff0187d4d 100644
--- a/core/net/queuebuf.h
+++ b/core/net/queuebuf.h
@@ -41,7 +41,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: queuebuf.h,v 1.2 2010/10/04 20:26:01 adamdunkels Exp $
+ * $Id: queuebuf.h,v 1.3 2010/10/12 19:51:28 oliverschmidt Exp $
  */
 
 /**
@@ -56,6 +56,12 @@
 
 #include "net/packetbuf.h"
 
+#ifdef QUEUEBUF_CONF_NUM
+#define QUEUEBUF_NUM QUEUEBUF_CONF_NUM
+#else
+#define QUEUEBUF_NUM 8
+#endif
+
 struct queuebuf;
 
 void queuebuf_init(void);
diff --git a/core/net/rime/collect.c b/core/net/rime/collect.c
index 3b597481b..ba23a03e8 100644
--- a/core/net/rime/collect.c
+++ b/core/net/rime/collect.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: collect.c,v 1.60 2010/10/11 23:42:01 adamdunkels Exp $
+ * $Id: collect.c,v 1.61 2010/10/12 19:51:28 oliverschmidt Exp $
  */
 
 /**
@@ -129,7 +129,7 @@ struct ack_msg {
 #define REXMIT_TIME                CLOCK_SECOND * 1
 #define MAX_REXMIT_TIME_SCALING    2
 #define FORWARD_PACKET_LIFETIME    (120 * (REXMIT_TIME))
-#define MAX_SENDING_QUEUE          QUEUEBUF_CONF_NUM / 2
+#define MAX_SENDING_QUEUE          QUEUEBUF_NUM / 2
 #define KEEPALIVE_REXMITS          8
 
 MEMB(send_queue_memb, struct packetqueue_item, MAX_SENDING_QUEUE);