summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-06-08 13:50:57 +0100
committerDamien George <damien.p.george@gmail.com>2014-06-08 13:50:57 +0100
commit26a95ae1e7470bafbb616000c98b5b2c729ca510 (patch)
treee3441930bf45d30e7b5c526c5ca8b5c50768ff94
parent4297fed1c384c6e1fc596fb471a645469a3e6118 (diff)
downloadmicropython-26a95ae1e7470bafbb616000c98b5b2c729ca510.tar.gz
micropython-26a95ae1e7470bafbb616000c98b5b2c729ca510.zip
windows: Move include of malloc.h outside #ifdef msvc.
-rw-r--r--windows/mpconfigport.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/windows/mpconfigport.h b/windows/mpconfigport.h
index 63eeb4d962..b9a50b0841 100644
--- a/windows/mpconfigport.h
+++ b/windows/mpconfigport.h
@@ -76,6 +76,9 @@ extern const struct _mp_obj_module_t mp_module_time;
#define MICROPY_PORT_BUILTIN_MODULES \
{ MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&mp_module_time }, \
+// We need to provide a declaration/definition of alloca()
+#include <malloc.h>
+
#include "realpath.h"
#include "init.h"
@@ -114,7 +117,6 @@ void msec_sleep(double msec);
#include <stddef.h> //for NULL
#include <assert.h> //for assert
-#include <malloc.h> //for alloca()
// Functions implemented in platform code