diff options
| author | Marcus von Appen <marcus@sysfault.org> | 2014-06-07 09:36:04 +0200 |
|---|---|---|
| committer | Marcus von Appen <marcus@sysfault.org> | 2014-06-07 09:36:04 +0200 |
| commit | 0c90eb16586d6c15d619666687449b3351e536fc (patch) | |
| tree | 90e87eaf27647ebe3d3996d6273672b271d47338 | |
| parent | c61be8e1e10a8c7bac3161cae531d26a9d754825 (diff) | |
| download | micropython-0c90eb16586d6c15d619666687449b3351e536fc.tar.gz micropython-0c90eb16586d6c15d619666687449b3351e536fc.zip | |
- FreeBSD provides alloca() via stdlib.h, in contrast to Linux and Windows
- Move the includes for alloca() intp mpconfigport.h
| -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 | ||||
| -rw-r--r-- | unix/modsocket.c | 1 | ||||
| -rw-r--r-- | unix/mpconfigport.h | 8 | ||||
| -rw-r--r-- | windows/mpconfigport.h | 2 |
7 files changed, 9 insertions, 6 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 77d57821b9..5c085f883c 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 cdbf99d4a5..b1fd19499c 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" diff --git a/unix/modsocket.c b/unix/modsocket.c index d6f732377d..b1a34a39b8 100644 --- a/unix/modsocket.c +++ b/unix/modsocket.c @@ -37,7 +37,6 @@ #include <arpa/inet.h> #include <netdb.h> #include <errno.h> -#include <alloca.h> #include "mpconfig.h" #include "nlr.h" diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index ace7a419b4..fe68b99341 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -98,3 +98,11 @@ extern const struct _mp_obj_fun_native_t mp_builtin_open_obj; #define MICROPY_PORT_BUILTINS \ { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, + + +/* We need the correct header for alloca() */ +#ifdef __FreeBSD__ +#include <stdlib.h> +#else +#include <alloca.h> +#endif diff --git a/windows/mpconfigport.h b/windows/mpconfigport.h index 94304e20d2..831a218fbc 100644 --- a/windows/mpconfigport.h +++ b/windows/mpconfigport.h @@ -114,7 +114,7 @@ void msec_sleep(double msec); #include <stddef.h> //for NULL #include <assert.h> //for assert - +#include <alloca.h> //for alloca() // Functions implemented in platform code |