diff options
| author | richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2> | 2013-07-16 12:23:25 +0000 |
|---|---|---|
| committer | richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2> | 2013-07-16 12:23:25 +0000 |
| commit | 5a640f4a8438e43875df66e3750a50836aeb8962 (patch) | |
| tree | a338f596aad0824d3e466d14ff07f3ff4d128e43 | |
| parent | 2dea2ef002e3a30fd0e2730af989b458251083bd (diff) | |
| download | freertos-5a640f4a8438e43875df66e3750a50836aeb8962.tar.gz | |
Correct compiler warnings in trace recorder code.
git-svn-id: http://svn.code.sf.net/p/freertos/code/trunk@1985 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
3 files changed, 6 insertions, 3 deletions
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c index 78334daa3..0b1770867 100644 --- 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();
if (lp != NULL)
{
- lp->type = LOW_POWER_BEGIN + flag; /* BEGIN or END depending on flag */
+ lp->type = LOW_POWER_BEGIN + ( uint8_t ) flag; /* BEGIN or END depending on flag */
lp->dts = dts;
prvTraceUpdateCounters();
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c index 6cf8c1f9c..74dc8079e 100644 --- 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) ******************************************************************************/
void vTraceClearError(int resetErrorMessage)
{
+ ( void ) resetErrorMessage;
traceErrorMessage = NULL;
RecorderDataPtr->internalErrorOccured = 0;
}
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 519735094..0ae6fa909 100644 --- 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.
#endif
-#ifndef TASK_H
- #error The FreeRTOS header file task.h must be included before FreeRTOS_Sockets.h.
+#ifndef INC_TASK_H
+ #ifndef TASK_H /* For compatibility with older FreeRTOS versions. */
+ #error The FreeRTOS header file task.h must be included before FreeRTOS_Sockets.h.
+ #endif
#endif
/* Assigned to an xSocket_t variable when the socket is not valid, probably
|