commit c5748994cab06d2e4d2b1b985bbbbc0eb396cb28
author Guillaume Endignoux <guillaumee@google.com> Fri Jun 26 11:39:07 2020 +0200
committer Guillaume Endignoux <guillaumee@google.com> Fri Jun 26 11:39:07 2020 +0200
tree a828f7b6a42710ed6ffc13404cbb4d13d508ee64
parent 944b63eed684e481b092f16e9089789c4042fd09

s/alloc_init()/libtock_alloc_init()/g

core/src/alloc.rs

diff --git a/core/src/alloc.rs b/core/src/alloc.rs
index 1c58edc..f971849 100644
--- a/core/src/alloc.rs
+++ b/core/src/alloc.rs
@@ -7,7 +7,7 @@
 static mut HEAP: Heap = Heap::empty();
 
 #[no_mangle]
-unsafe fn alloc_init(app_heap_start: usize, app_heap_size: usize) {
+unsafe fn libtock_alloc_init(app_heap_start: usize, app_heap_size: usize) {
     HEAP.init(app_heap_start, app_heap_size);
 }
 

core/src/entry_point/mod.rs

diff --git a/core/src/entry_point/mod.rs b/core/src/entry_point/mod.rs
index 0a63b8e..2ab2351 100644
--- a/core/src/entry_point/mod.rs
+++ b/core/src/entry_point/mod.rs
@@ -128,7 +128,7 @@
     memop::set_brk(app_heap_end as *const u8);
 
     #[cfg(feature = "alloc_init")]
-    crate::alloc_init(app_heap_start, app_heap_size);
+    crate::libtock_alloc_init(app_heap_start, app_heap_size);
 
     main(0, ptr::null());
 

core/src/lib.rs

diff --git a/core/src/lib.rs b/core/src/lib.rs
index a529b55..ce77176 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -10,7 +10,7 @@
 
 #[cfg(feature = "alloc_init")]
 extern "Rust" {
-    fn alloc_init(app_heap_start: usize, app_heap_size: usize);
+    fn libtock_alloc_init(app_heap_start: usize, app_heap_size: usize);
 }
 
 pub mod callback;