Correct compiler warnings in trace recorder code.

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

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c
index 78334daa35efe8037ca340d8d173e81c978faa75..0b1770867667bb33eb573c34005226064bdb04f8 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c
@@ -128,7 +128,7 @@ void vTraceStoreLowPower(uint32_t flag)
                        lp = (LPEvent*)xTraceNextFreeEventBufferSlot();\r
                        if (lp != NULL)\r
                        {\r
-                               lp->type = LOW_POWER_BEGIN + flag; /* BEGIN or END depending on flag */\r
+                               lp->type = LOW_POWER_BEGIN + ( uint8_t ) flag; /* BEGIN or END depending on flag */\r
                                lp->dts = dts;\r
 \r
                                prvTraceUpdateCounters();\r

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c
index 6cf8c1f9c76fe835bbb1c6e494b7e1d8b7890b67..74dc8079e47d0d5bd9e1a631f339ec2d6d9b0d31 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c
@@ -208,6 +208,7 @@ char* xTraceGetLastError(void)
 ******************************************************************************/\r
 void vTraceClearError(int resetErrorMessage)\r
 {\r
+       ( void ) resetErrorMessage;\r
        traceErrorMessage = NULL;       \r
        RecorderDataPtr->internalErrorOccured = 0;\r
 }\r

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h
index 519735094e00f13e1f0eb69bf0847ff03c95cb57..0ae6fa90908a798f6dc6a3396297dc038455c950 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h
@@ -52,8 +52,10 @@
        #error FreeRTOS.h must be included before FreeRTOS_Sockets.h.\r
 #endif\r
 \r
-#ifndef TASK_H\r
-       #error The FreeRTOS header file task.h must be included before FreeRTOS_Sockets.h.\r
+#ifndef INC_TASK_H\r
+       #ifndef TASK_H /* For compatibility with older FreeRTOS versions. */\r
+               #error The FreeRTOS header file task.h must be included before FreeRTOS_Sockets.h.\r
+       #endif\r
 #endif\r
 \r
 /* Assigned to an xSocket_t variable when the socket is not valid, probably\r