Put in "catch all" portmacro.h include to allow the path to the correct portmacro...

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@718 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Source/include/portable.h b/Source/include/portable.h
index 9dd3874d93cd70c3ab90cbda31652f971a0f5234..5fbce72c6343282e28cff3c2b66e932910e859e6 100644 (file)
--- a/Source/include/portable.h
+++ b/Source/include/portable.h
@@ -291,6 +291,16 @@
        #include "../../Source/portable/IAR/78K0R/portmacro.h"\r
 #endif\r
        \r
+/* Catch all to ensure portmacro.h is included in the build.  Newer demos\r
+have the path as part of the project options, rather than as relative from\r
+the project location.  If portENTER_CRITICAL() has not been defined then\r
+portmacro.h has not yet been included - as every portmacro.h provides a\r
+portENTER_CRITICAL() definition.  Check the demo application for your demo\r
+to find the path to the correct portmacro.h file. */\r
+#ifndef portENTER_CRITICAL\r
+       #include "portmacro.h"  \r
+#endif\r
+       \r
 #ifdef __cplusplus\r
 extern "C" {\r
 #endif\r
@@ -299,6 +309,7 @@ extern "C" {
  * Setup the stack of a new task so it is ready to be placed under the\r
  * scheduler control.  The registers have to be placed on the stack in\r
  * the order that the port expects to find them.\r
+ *\r
  */\r
 portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters );\r
 \r