Merge 4bc8d25cec into e3a362b1d1

include/list.h

@@ -44,7 +44,7 @@
  *
  * In addition to it's value, each list item contains a pointer to the next
  * item in the list (pxNext), a pointer to the list it is in (pxContainer)
- * and a pointer back to the object that contains it.  These later two
+ * and a pointer to back to the object that contains it.  These later two
  * pointers are included for efficiency of list manipulation.  There is
  * effectively a two way link between the object containing the list item and
  * the list item itself.

portable/ThirdParty/GCC/Posix/port.c

@@ -193,7 +193,7 @@ void prvFatalError( const char * pcCall,
 }
 /*-----------------------------------------------------------*/
 
-static void prvPortSetCurrentThreadName( const char * pxThreadName )
+static void prvPortSetCurrentThreadName( char * pxThreadName )
 {
     #ifdef __APPLE__
         pthread_setname_np( pxThreadName );