diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-04 01:28:40 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-04 01:28:40 +0000 |
| commit | a58cf679ee466b0bcd873603515a3ef293252b20 (patch) | |
| tree | 5c8f539733f248b7f601ed29b439fb25295a26d7 /unix-cpy | |
| parent | e241e8c1698e5299deb10b718ffa30e2cca39301 (diff) | |
| parent | c8d1384fc0c7aafa5dee3445ece20f4e43dfa9c1 (diff) | |
| download | micropython-a58cf679ee466b0bcd873603515a3ef293252b20.tar.gz micropython-a58cf679ee466b0bcd873603515a3ef293252b20.zip | |
Merge remote-tracking branch 'upstream/master' into list_count
Diffstat (limited to 'unix-cpy')
| -rw-r--r-- | unix-cpy/Makefile | 1 | ||||
| -rw-r--r-- | unix-cpy/mpconfigport.h | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/unix-cpy/Makefile b/unix-cpy/Makefile index 48c3179460..7fee3438fb 100644 --- a/unix-cpy/Makefile +++ b/unix-cpy/Makefile @@ -43,6 +43,7 @@ PY_O = \ objnone.o \ objrange.o \ objset.o \ + objslice.o \ objstr.o \ objtuple.o \ objtype.o \ diff --git a/unix-cpy/mpconfigport.h b/unix-cpy/mpconfigport.h index db72b31455..983b166a55 100644 --- a/unix-cpy/mpconfigport.h +++ b/unix-cpy/mpconfigport.h @@ -11,15 +11,11 @@ #ifdef __LP64__ typedef long machine_int_t; // must be pointer size typedef unsigned long machine_uint_t; // must be pointer size -#define UINT_FMT "%lu" -#define INT_FMT "%ld" #else // These are definitions for machines where sizeof(int) == sizeof(void*), // regardless for actual size. typedef int machine_int_t; // must be pointer size typedef unsigned int machine_uint_t; // must be pointer size -#define UINT_FMT "%u" -#define INT_FMT "%d" #endif #define BYTES_PER_WORD sizeof(machine_int_t) |