Skip to content

Commit bf1dfb3

Browse files
Merge branch 'main' into update_download_folder
2 parents 2b991c7 + 67bc5a9 commit bf1dfb3

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

FreeRTOS/Demo/Posix_GCC/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ else()
3535
set( CMAKE_BUILD_TYPE "debug" )
3636
endif()
3737

38-
set(CMAKE_CXX_FLAGS_RELEASE "-O3")
39-
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3")
38+
set(CMAKE_C_FLAGS_RELEASE "-O3")
39+
set(CMAKE_C_FLAGS_DEBUG "-O0 -g3")
4040

4141
if( SANITIZE_ADDRESS )
4242
add_compile_options( -fsanitize=address -fsanitize=alignment )

FreeRTOS/Demo/Posix_GCC/main_full.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ void vFullDemoIdleFunction( void )
510510

511511
/* Exercise heap_5 a bit. The malloc failed hook will trap failed
512512
* allocations so there is no need to test here. */
513-
pvAllocated = pvPortMalloc( ( rand() % 500 ) + 1 );
513+
pvAllocated = pvPortMalloc( ( size_t ) ( ( rand() % 500 ) + 1 ) );
514514
vPortFree( pvAllocated );
515515

516516
/* Exit after a fixed time so code coverage results are written to the
@@ -656,7 +656,8 @@ static void prvDemonstrateTimerQueryFunctions( void )
656656

657657
static void prvDemonstratePendingFunctionCall( void )
658658
{
659-
static intptr_t ulParameter1 = 1000UL, ulParameter2 = 0UL;
659+
static intptr_t ulParameter1 = 1000L;
660+
static uint32_t ulParameter2 = 0UL;
660661
const TickType_t xDontBlock = 0; /* This is called from the idle task so must *not* attempt to block. */
661662

662663
/* prvPendedFunction() just expects the parameters to be incremented by one

0 commit comments

Comments
 (0)