From ba28d36e673946298e6c5511b8720966127c113c Mon Sep 17 00:00:00 2001
From: goldsimon <goldsimon>
Date: Sun, 26 Jun 2011 17:13:57 +0000
Subject: [PATCH] Fixed bug #33544 (warning in mem.c in lwip 1.4.0 with
 NO_SYS=1)

---
 CHANGELOG      | 8 +++++++-
 src/core/mem.c | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index c47b87a6..e6386505 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,11 @@ HISTORY
 
  ++ New features:
 
-  2011-05-25: Simon Goldschmidt
+  2011-06-26: Simon Goldschmidt (patch by Cameron Gutman)
+  * tcp.c, tcp_out.c: bug #33604: added some more asserts to check that
+    pcb->state != LISTEN
+
+ 2011-05-25: Simon Goldschmidt
   * again nearly the whole stack, renamed ip.c to ip4.c, ip_addr.c to ip4_addr.c,
     combined ipv4/ipv6 inet_chksum.c, added ip.h, ip_addr.h: Combined IPv4
     and IPv6 code where possible, added defines to access IPv4/IPv6 in non-IP
@@ -23,6 +27,8 @@ HISTORY
 
  ++ Bugfixes:
 
+  2011-06-26: Simon Goldschmidt
+  * mem.c: fixed bug #33544 "warning in mem.c in lwip 1.4.0 with NO_SYS=1"
 
 
 
diff --git a/src/core/mem.c b/src/core/mem.c
index 98375553..9dbbaf65 100644
--- a/src/core/mem.c
+++ b/src/core/mem.c
@@ -190,7 +190,9 @@ static struct mem *ram_end;
 static struct mem *lfree;
 
 /** concurrent access protection */
+#if !NO_SYS
 static sys_mutex_t mem_mutex;
+#endif
 
 #if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT