diff options
author | Damien George <damien.p.george@gmail.com> | 2014-06-08 13:18:14 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-06-08 13:18:14 +0100 |
commit | df896eceef27bc9a159bd62cdd78c66a56462544 (patch) | |
tree | b3dce6a1d4cdb931e784c380ab813012a35ddaba /py | |
parent | 9e951498b28706bac7347d3c599977c13d9515c4 (diff) | |
parent | 0c90eb16586d6c15d619666687449b3351e536fc (diff) | |
download | micropython-df896eceef27bc9a159bd62cdd78c66a56462544.tar.gz micropython-df896eceef27bc9a159bd62cdd78c66a56462544.zip |
Merge branch 'alloca' of github.com:marcusva/micropython into marcusva-alloca
Diffstat (limited to 'py')
-rw-r--r-- | py/builtinimport.c | 1 | ||||
-rw-r--r-- | py/objfun.c | 1 | ||||
-rw-r--r-- | py/runtime.c | 1 | ||||
-rw-r--r-- | py/vm.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/py/builtinimport.c b/py/builtinimport.c index 795d9fd5e1..44ba4d5541 100644 --- a/py/builtinimport.c +++ b/py/builtinimport.c @@ -29,7 +29,6 @@ #include <stdio.h> #include <string.h> #include <assert.h> -#include <alloca.h> #include "mpconfig.h" #include "nlr.h" diff --git a/py/objfun.c b/py/objfun.c index 5743fa550f..d63acc687b 100644 --- a/py/objfun.c +++ b/py/objfun.c @@ -28,7 +28,6 @@ #include <stdbool.h> #include <string.h> #include <assert.h> -#include <alloca.h> #include "mpconfig.h" #include "nlr.h" diff --git a/py/runtime.c b/py/runtime.c index 179b48d327..d57bb686d1 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -27,7 +27,6 @@ #include <stdio.h> #include <string.h> #include <assert.h> -#include <alloca.h> #include "mpconfig.h" #include "nlr.h" @@ -28,7 +28,6 @@ #include <stdio.h> #include <string.h> #include <assert.h> -#include <alloca.h> #include "mpconfig.h" #include "nlr.h" |