djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zephyr/mpconfigport.h: Fix rebasing artifacts.

Browse Source
This commit is contained in:
Paul Sokolovsky 2016-10-12 19:42:55 +03:00
parent b6a544b917
commit 1a01ed0d2a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zephyr/mpconfigport.h
View File

@ -1,5 +1,8 @@
#include <alloca.h> #include <alloca.h>
// Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles
#include "autoconf.h"
// Saving extra crumbs to make sure binary fits in 128K // Saving extra crumbs to make sure binary fits in 128K
#define MICROPY_COMP_CONST_FOLDING (0) #define MICROPY_COMP_CONST_FOLDING (0)
#define MICROPY_COMP_CONST (0) #define MICROPY_COMP_CONST (0)
@ -49,9 +52,6 @@ typedef long mp_off_t;
mp_obj_t mp_kbd_exception; \ mp_obj_t mp_kbd_exception; \
const char *readline_hist[8]; const char *readline_hist[8];
// Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles
#include "autoconf.h"
// extra built in names to add to the global namespace // extra built in names to add to the global namespace
#define MICROPY_PORT_BUILTINS \ #define MICROPY_PORT_BUILTINS \
{ MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj }, \