From b76fd842f0299a1b5a937cb3f16bc11ccb723bb8 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 20 Apr 2014 22:10:27 +0300 Subject: unix mem_info(): Dump GC info only if it's enabled. --- unix/main.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'unix/main.c') diff --git a/unix/main.c b/unix/main.c index 940fe48c1..e4536f381 100644 --- a/unix/main.c +++ b/unix/main.c @@ -250,7 +250,9 @@ int usage(char **argv) { mp_obj_t mem_info(void) { printf("mem: total=%d, current=%d, peak=%d\n", m_get_total_bytes_allocated(), m_get_current_bytes_allocated(), m_get_peak_bytes_allocated()); +#if MICROPY_ENABLE_GC gc_dump_info(); +#endif return mp_const_none; } -- cgit v1.2.3 From a196d08dfc600615e7b3ce3f774ec4de3f0c0b19 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 20 Apr 2014 22:19:14 +0300 Subject: unix windows: mingw32 doesn't have realpath(), use _fullpath() instead. --- unix/main.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'unix/main.c') diff --git a/unix/main.c b/unix/main.c index e4536f381..4c86edeae 100644 --- a/unix/main.c +++ b/unix/main.c @@ -394,7 +394,11 @@ int main(int argc, char **argv) { return usage(argv); } } else { +#ifdef __MINGW32__ + char *basedir = _fullpath(NULL, argv[a], _MAX_PATH); +#else char *basedir = realpath(argv[a], NULL); +#endif if (basedir == NULL) { fprintf(stderr, "%s: can't open file '%s': [Errno %d] ", argv[0], argv[1], errno); perror(""); -- cgit v1.2.3