Skip to content

Commit 98d2aa8

Browse files
committed
Sync with main
1 parent 76f5bf3 commit 98d2aa8

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

lib/lua/src/lua_file.cpp

+9-7
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,15 @@ void* custom_allocator(void *ud, void *ptr, size_t osize, size_t nsize) {
8080
free(ptr);
8181
}
8282
return NULL;
83-
} else {
84-
// Allocate or resize the block
85-
#ifdef ESP_PLATFORM
86-
return ps_realloc(ptr, nsize);
87-
#else
88-
return realloc(ptr, nsize);
89-
#endif
83+
}
84+
else
85+
{
86+
// Allocate or resize the block
87+
#ifdef ESP32
88+
return ps_realloc(ptr, nsize);
89+
#else
90+
return realloc(ptr, nsize);
91+
#endif
9092
}
9193
}
9294

lib/system/libsystem.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ void libsystem::panic(const std::string &message, const bool restart) {
9898

9999
// Backtrace
100100

101+
// backtrace_saver::re_restart_debug_t backtraceData = backtrace_saver::getCurrentBacktrace();
101102
std::string fullBacktraceData;
102103

103104
std::cerr << "Backtrace:" << std::endl;

0 commit comments

Comments
 (0)