summaryrefslogtreecommitdiffstatshomepage
path: root/py/malloc.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-06-25 04:10:34 +0100
committerDamien George <damien.p.george@gmail.com>2014-06-25 04:10:34 +0100
commite973acde81462de0c205f27db2642a08022fb3a8 (patch)
treec6862ead76ae12979b3c3d6d1ec20774884c72ef /py/malloc.c
parent780e54cdc3491409060f90003ca64fcdd3f9f1e6 (diff)
parent939c2e7f448fbe6b44d0079d2fc33c7ac7eb32d0 (diff)
downloadmicropython-e973acde81462de0c205f27db2642a08022fb3a8.tar.gz
micropython-e973acde81462de0c205f27db2642a08022fb3a8.zip
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/malloc.c')
-rw-r--r--py/malloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/py/malloc.c b/py/malloc.c
index b180ddf6b5..8e90849e93 100644
--- a/py/malloc.c
+++ b/py/malloc.c
@@ -28,8 +28,8 @@
#include <stdlib.h>
#include <string.h>
-#include "misc.h"
#include "mpconfig.h"
+#include "misc.h"
#if 0 // print debugging info
#define DEBUG_printf DEBUG_printf