summaryrefslogtreecommitdiffstatshomepage
path: root/py/builtinimport.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-04-21 01:18:05 +0100
committerDamien George <damien.p.george@gmail.com>2014-04-21 01:18:05 +0100
commit0ae21a81f70806afc6f96fe099083bc8273ab34c (patch)
treec8e4680b545c720ca28e6a142702ef2f5909f5d7 /py/builtinimport.c
parent3771a097dac8baaf6dc8a9618dc8a1074a43c439 (diff)
parent521de04ce2dc7048afbdb2445979a203512b13e2 (diff)
downloadmicropython-0ae21a81f70806afc6f96fe099083bc8273ab34c.tar.gz
micropython-0ae21a81f70806afc6f96fe099083bc8273ab34c.zip
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/builtinimport.c')
-rw-r--r--py/builtinimport.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 262ee04a53..4a2f6510c3 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -3,6 +3,10 @@
#include <stdio.h>
#include <string.h>
#include <assert.h>
+#ifdef __MINGW32__
+// For alloca()
+#include <malloc.h>
+#endif
#include "nlr.h"
#include "misc.h"