diff options
author | Damien George <damien.p.george@gmail.com> | 2014-06-07 22:02:35 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-06-07 22:02:35 +0100 |
commit | d31a093f9c2bdc3c94917c928fb2cc8c26b39959 (patch) | |
tree | 8d45798562c303ebfdf889e3babdfbb0b2abc210 /unix/mpconfigport.h | |
parent | f0778a7ccbbdd1d7bf116a6939c7eb05173e1987 (diff) | |
parent | 5473f743f37e12921f4acb11fa84fe0d2b9d0650 (diff) | |
download | micropython-d31a093f9c2bdc3c94917c928fb2cc8c26b39959.tar.gz micropython-d31a093f9c2bdc3c94917c928fb2cc8c26b39959.zip |
Merge branch 'master' of github.com:micropython/micropython
Conflicts:
py/emitglue.c
Diffstat (limited to 'unix/mpconfigport.h')
-rw-r--r-- | unix/mpconfigport.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index ace7a419b4..bf2cf73efd 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -43,6 +43,7 @@ #define MICROPY_OPT_COMPUTED_GOTO (1) #define MICROPY_PY_BUILTINS_FROZENSET (1) #define MICROPY_PY_SYS_EXIT (1) +#define MICROPY_PY_SYS_PLATFORM "linux" #define MICROPY_PY_SYS_STDFILES (1) #define MICROPY_PY_CMATH (1) #define MICROPY_PY_IO_FILEIO (1) |