summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-05-03 12:45:01 +0100
committerDamien George <damien.p.george@gmail.com>2014-05-03 12:45:01 +0100
commit3119b600d8578d866de76d49287099e3cc5685ed (patch)
treec30b5ebeddedf586bb46f10d7fc247af7e7e63a7
parent451f78d156b63c97db60eda438c40fd3740ce347 (diff)
parent5ee1e0f5341c2c1334bb089f5b25ee814b26e705 (diff)
downloadmicropython-3119b600d8578d866de76d49287099e3cc5685ed.tar.gz
micropython-3119b600d8578d866de76d49287099e3cc5685ed.zip
Merge branch 'master' of github.com:micropython/micropython
-rw-r--r--windows/alloca.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/windows/alloca.h b/windows/alloca.h
index f8fa6f17a0..1cf7722669 100644
--- a/windows/alloca.h
+++ b/windows/alloca.h
@@ -1 +1,3 @@
-#include <malloc.h>
+// Compatibility header to workaround lack of native alloca.h in some
+// Windows toolchains.
+#include <malloc.h>