Changed type of _estack. 3.4.0 stable candidate.

3 files changed, 3 insertions, 6 deletions

diff --git a/src/Platform/Tasks.cpp b/src/Platform/Tasks.cpp
index 983cb066..8ef89076 100644
--- a/src/Platform/Tasks.cpp
+++ b/src/Platform/Tasks.cpp
@@ -30,9 +30,6 @@
 
 const uint8_t memPattern = 0xA5;		// this must be the same pattern as FreeRTOS because we use common code for checking for stack overflow
 
-extern char _end;						// defined in linker script
-extern char _estack;					// defined in linker script
-
 // Define replacement standard library functions
 #include <syscalls.h>
 
@@ -247,7 +244,7 @@ extern "C" [[noreturn]] void MainTask(void *pvParameters) noexcept
 // Return the amount of free handler stack space. It may be negative if the stack has overflowed into the area reserved for the heap.
 static ptrdiff_t GetHandlerFreeStack() noexcept
 {
-	const char * const ramend = &_estack;
+	const char * const ramend = (const char*)&_estack;
 	const char * stack_lwm = sysStackLimit;
 	while (stack_lwm < ramend && *stack_lwm == memPattern)
 	{
diff --git a/src/SBC/SbcInterface.cpp b/src/SBC/SbcInterface.cpp
index 1bb3e0ff..0d7a47b4 100644
--- a/src/SBC/SbcInterface.cpp
+++ b/src/SBC/SbcInterface.cpp
@@ -76,7 +76,7 @@ void SbcInterface::Init() noexcept
 		transfer.Init();
 		sbcTask = new Task<SBCTaskStackWords>();
 		sbcTask->Create(SBCTaskStart, "SBC", nullptr, TaskPriority::SbcPriority);
-		iapRamAvailable = &_estack - Tasks::GetHeapTop();
+		iapRamAvailable = (const char*)&_estack - Tasks::GetHeapTop();
 	}
 	else
 	{
diff --git a/src/Version.h b/src/Version.h
index c7b0dece..bea09868 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -10,7 +10,7 @@
 
 #ifndef VERSION
 // Note: the complete VERSION string must be in standard version number format and must not contain spaces! This is so that DWC can parse it.
-# define MAIN_VERSION	"3.4.0rc2+3"
+# define MAIN_VERSION	"3.4.0"
 # ifdef USE_CAN0
 #  define VERSION_SUFFIX	"(CAN0)"
 # else