Merge branch 'master' of github.com:micropython/micropython

2 files changed, 0 insertions, 9 deletions

diff --git a/stm/malloc0.c b/stm/malloc0.c
index 7e3f620db..eaa436f4f 100644
--- a/stm/malloc0.c
+++ b/stm/malloc0.c
@@ -29,14 +29,6 @@ void *realloc(void *ptr, size_t n) {
 
 #endif
 
-void *calloc(size_t sz, size_t n) {
-    char *ptr = malloc(sz * n);
-    for (int i = 0; i < sz * n; i++) {
-        ptr[i] = 0;
-    }
-    return ptr;
-}
-
 void *malloc(size_t n) {
     return gc_alloc(n);
 }
diff --git a/stm/std.h b/stm/std.h
index 98c719676..41f477d26 100644
--- a/stm/std.h
+++ b/stm/std.h
@@ -4,7 +4,6 @@ void __assert_func(void);
 
 void *malloc(size_t n);
 void free(void *ptr);
-void *calloc(size_t sz, size_t n);
 void *realloc(void *ptr, size_t n);
 
 void *memcpy(void *dest, const void *src, size_t n);