diff options
| author | Tony DiCola <tony@tonydicola.com> | 2016-10-20 23:01:13 +0000 |
|---|---|---|
| committer | Tony DiCola <tony@tonydicola.com> | 2016-10-20 23:01:13 +0000 |
| commit | 00a44fa36cd1e35a438c4b89b5cef0bc82787c7a (patch) | |
| tree | 4800a6984902e043e3fc437adcdfcd665f83e220 /unix | |
| parent | 1f13f870b8f6554d9cd5570de221a6886e065b64 (diff) | |
| parent | 3967ca7390ff8257728ef6237b93977b63bde41d (diff) | |
Merge remote-tracking branch 'micropython/master'
Conflicts:
README.md - Kept Adafruit README.md intact.
py/emitglue.c - Added xtensa architecture as an OR of the define.
zephyr/README.md - Fixed spelling mistake.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile | 2 | ||||
| -rw-r--r-- | unix/coverage.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/unix/Makefile b/unix/Makefile index 4a313b3a8..53ff4cb48 100644 --- a/unix/Makefile +++ b/unix/Makefile @@ -273,7 +273,7 @@ coverage_test: coverage gcov -o build-coverage/extmod ../extmod/*.c $(BUILD)/_frozen_upip.c: $(BUILD)/frozen_upip/upip.py - ../tools/make-frozen.py $(dir $^) > $@ + $(MAKE_FROZEN) $(dir $^) > $@ # Select latest upip version available UPIP_TARBALL := $(shell ls -1 -v ../tools/micropython-upip-*.tar.gz | tail -n1) diff --git a/unix/coverage.c b/unix/coverage.c index c84a653f7..6a1b43fdc 100644 --- a/unix/coverage.c +++ b/unix/coverage.c @@ -34,7 +34,7 @@ STATIC mp_obj_t extra_coverage(void) { // vstr { mp_printf(&mp_plat_print, "# vstr\n"); - vstr_t *vstr = vstr_new_size(16); + vstr_t *vstr = vstr_new(16); vstr_hint_size(vstr, 32); vstr_add_str(vstr, "ts"); vstr_ins_byte(vstr, 1, 'e'); |