From c4f3b8818aec0240451c4c31cafe670b19f3ad26 Mon Sep 17 00:00:00 2001
From: goldsimon <goldsimon@gmx.de>
Date: Wed, 23 Nov 2011 20:58:19 +0100
Subject: [PATCH] fixed bug #34884: sys_msleep() body needs to be surrounded
 with '#ifndef sys_msleep'

---
 CHANGELOG      | 4 ++++
 src/core/sys.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 909a3ed0..87a5641f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -49,6 +49,10 @@ HISTORY
 
  ++ Bugfixes:
 
+  2011-11-23: Simon Goldschmidt
+  * sys.c: fixed bug #34884: sys_msleep() body needs to be surrounded with
+    '#ifndef sys_msleep'
+
   2011-11-22: Simon Goldschmidt
   * netif.c, etharp.h/.c: fixed bug #34684: Clear the arp table cache when
     netif is brought down
diff --git a/src/core/sys.c b/src/core/sys.c
index d3a77deb..f1777372 100644
--- a/src/core/sys.c
+++ b/src/core/sys.c
@@ -45,6 +45,7 @@
 
 #if !NO_SYS
 
+#ifndef sys_msleep
 /**
  * Sleep for some ms. Timeouts are NOT processed while sleeping.
  *
@@ -62,5 +63,6 @@ sys_msleep(u32_t ms)
     }
   }
 }
+#endif /* sys_msleep */
 
 #endif /* !NO_SYS */