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 /py/qstrdefs.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 'py/qstrdefs.h')
| -rw-r--r-- | py/qstrdefs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/py/qstrdefs.h b/py/qstrdefs.h index 69182f2809..521d4399a5 100644 --- a/py/qstrdefs.h +++ b/py/qstrdefs.h @@ -60,6 +60,7 @@ Q(__str__) Q(__getattr__) Q(__del__) Q(__call__) +Q(__lt__) Q(micropython) Q(bytecode) @@ -343,6 +344,9 @@ Q(byteorder) Q(big) Q(exit) Q(little) +#ifdef MICROPY_PY_SYS_PLATFORM +Q(platform) +#endif Q(stdin) Q(stdout) Q(stderr) |