From 59b727e66f1a79f368b2ab9e3d18205188a97061 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 30 Jan 2010 10:14:30 +0000
Subject: Fixed bug 2942757.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1552 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/include/threads.h  | 3 +++
 os/kernel/templates/chconf.h | 1 +
 2 files changed, 4 insertions(+)

(limited to 'os')

diff --git a/os/kernel/include/threads.h b/os/kernel/include/threads.h
index 6c674dea7..f94beac32 100644
--- a/os/kernel/include/threads.h
+++ b/os/kernel/include/threads.h
@@ -33,6 +33,9 @@
 #if CH_USE_DYNAMIC && !CH_USE_WAITEXIT
 #error "CH_USE_DYNAMIC requires CH_USE_WAITEXIT"
 #endif
+#if CH_USE_DYNAMIC && !CH_USE_HEAP && !CH_USE_MEMPOOLS
+#error "CH_USE_DYNAMIC requires CH_USE_HEAP and/or CH_USE_MEMPOOLS"
+#endif
 
 /**
  * @brief Structure representing a thread.
diff --git a/os/kernel/templates/chconf.h b/os/kernel/templates/chconf.h
index 5b42d3c9c..7fc7ea82b 100644
--- a/os/kernel/templates/chconf.h
+++ b/os/kernel/templates/chconf.h
@@ -329,6 +329,7 @@
  *
  * @note The default is @p TRUE.
  * @note Requires @p CH_USE_WAITEXIT.
+ * @note Requires @p CH_USE_HEAP and/or @p CH_USE_MEMPOOLS.
  */
 #if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__)
 #define CH_USE_DYNAMIC                  TRUE
-- 
cgit v1.2.3