From 94eecb64f1eae0d36a07e96473992f07a81e9811 Mon Sep 17 00:00:00 2001 From: barner Date: Fri, 22 Dec 2006 17:14:06 +0000 Subject: [PATCH] Respect MMEM_CONF_SIZE user option, otherwise default to 4096 byts for MMEM_SIZE. --- core/lib/mmem.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/lib/mmem.c b/core/lib/mmem.c index 067b4f0b3..52e580fad 100644 --- a/core/lib/mmem.c +++ b/core/lib/mmem.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: mmem.c,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $ + * @(#)$Id: mmem.c,v 1.2 2006/12/22 17:14:06 barner Exp $ */ /** @@ -47,10 +47,14 @@ #include "mmem.h" #include "list.h" - +#include "contiki-conf.h" #include +#ifdef MMEM_CONF_SIZE +#define MMEM_SIZE MMEM_CONF_SIZE +#else #define MMEM_SIZE 4096 +#endif LIST(mmemlist); unsigned int avail_memory;