Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependents: HelloWorld_CCA01M1 HelloWorld_CCA02M1 CI-data-logger-server HelloWorld_CCA02M1 ... more
This is a fork of the events subdirectory of https://github.com/ARMmbed/mbed-os.
Note, you must import this library with import name: events!!!
Diff: hal/common/retarget.cpp
- Revision:
- 7539:b568b913d7a4
- Parent:
- 7514:a0c71f3f3d2f
- Child:
- 7577:7f69c9d2176d
--- a/hal/common/retarget.cpp Tue Aug 23 14:14:10 2016 +0100
+++ b/hal/common/retarget.cpp Wed Aug 24 10:22:05 2016 +0100
@@ -500,8 +500,10 @@
#include "uvisor-lib/uvisor-lib.h"
#endif/* FEATURE_UVISOR */
+extern "C" {
+
+/* uVisor wraps malloc_r, realloc_r and free_r, but not calloc_r! */
#ifndef FEATURE_UVISOR
-extern "C" {
extern "C" void __malloc_lock( struct _reent *_r );
extern "C" void __malloc_unlock( struct _reent *_r );
@@ -586,6 +588,9 @@
malloc_stats_mutex->unlock();
#endif
}
+
+#endif/* FEATURE_UVISOR */
+
void* __wrap__calloc_r(struct _reent * r, size_t num, size_t size) {
#if !defined(MBED_HEAP_STATS_ENABLED ) || !MBED_HEAP_STATS_ENABLED
extern void* __real__calloc_r(struct _reent * r, size_t num, size_t size);
@@ -603,7 +608,6 @@
#endif
}
}
-#endif/* FEATURE_UVISOR */
extern "C" WEAK void software_init_hook_rtos(void)
{