Skip to content

Commit df896ec

Browse files
dpgeorgedpgeorge
committed
Merge branch 'alloca' of github.com:marcusva/micropython into marcusva-alloca
2 parents 9e95149 + 0c90eb1 commit df896ec

7 files changed

Lines changed: 9 additions & 6 deletions

File tree

‎py/builtinimport.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include <stdio.h>
3030
#include <string.h>
3131
#include <assert.h>
32-
#include <alloca.h>
3332

3433
#include "mpconfig.h"
3534
#include "nlr.h"

‎py/objfun.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include <stdbool.h>
2929
#include <string.h>
3030
#include <assert.h>
31-
#include <alloca.h>
3231

3332
#include "mpconfig.h"
3433
#include "nlr.h"

‎py/runtime.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <stdio.h>
2828
#include <string.h>
2929
#include <assert.h>
30-
#include <alloca.h>
3130

3231
#include "mpconfig.h"
3332
#include "nlr.h"

‎py/vm.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include <stdio.h>
2929
#include <string.h>
3030
#include <assert.h>
31-
#include <alloca.h>
3231

3332
#include "mpconfig.h"
3433
#include "nlr.h"

‎unix/modsocket.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include <arpa/inet.h>
3838
#include <netdb.h>
3939
#include <errno.h>
40-
#include <alloca.h>
4140

4241
#include "mpconfig.h"
4342
#include "nlr.h"

‎unix/mpconfigport.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,11 @@ extern const struct _mp_obj_fun_native_t mp_builtin_open_obj;
9999
#define MICROPY_PORT_BUILTINS \
100100
{ MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
101101
{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
102+
103+
104+
/* We need the correct header for alloca() */
105+
#ifdef __FreeBSD__
106+
#include <stdlib.h>
107+
#else
108+
#include <alloca.h>
109+
#endif

‎windows/mpconfigport.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void msec_sleep(double msec);
114114

115115
#include <stddef.h> //for NULL
116116
#include <assert.h> //for assert
117-
117+
#include <alloca.h> //for alloca()
118118

119119
// Functions implemented in platform code
120120

0 commit comments

Comments
 (0)