diff options
| author | Daniel Tralamazza <daniel@tralamazza.com> | 2017-08-08 00:45:58 +0200 |
|---|---|---|
| committer | Daniel Tralamazza <daniel@tralamazza.com> | 2017-08-08 00:45:58 +0200 |
| commit | b53b6913147bdee5aef1b54f7728d44580dd0935 (patch) | |
| tree | cfbfad1ddf3ef386131ec5a39961be70d4b60398 /py/malloc.c | |
| parent | 3e0d3d283d5619e52e04dc8484d7bf413e66d130 (diff) | |
| parent | 6c55cdafa32e4db9e2aaf08b1ec597b4723721ea (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'py/malloc.c')
| -rw-r--r-- | py/malloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/malloc.c b/py/malloc.c index f48cb8da4..e679e2092 100644 --- a/py/malloc.c +++ b/py/malloc.c @@ -1,5 +1,5 @@ /* - * This file is part of the Micro Python project, http://micropython.org/ + * This file is part of the MicroPython project, http://micropython.org/ * * The MIT License (MIT) * @@ -46,7 +46,7 @@ #include "py/gc.h" // We redirect standard alloc functions to GC heap - just for the rest of -// this module. In the rest of micropython source, system malloc can be +// this module. In the rest of MicroPython source, system malloc can be // freely accessed - for interfacing with system and 3rd-party libs for // example. On the other hand, some (e.g. bare-metal) ports may use GC // heap as system heap, so, to avoid warnings, we do undef's first. |