diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-13 23:14:35 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-13 23:14:35 +0000 |
| commit | 93451002f04e0b89e41e1faa82f86e937bb219f1 (patch) | |
| tree | 478f8fedae2b08f12181c98a4a3d1c4cdf19403d /py/mpconfig.h | |
| parent | 88cb1e60e0b780d71e9c2d7b0acafa71ba3ea318 (diff) | |
| parent | ca318bba0d97c66d8fb14a089d8fa269a0e1b424 (diff) | |
| download | micropython-93451002f04e0b89e41e1faa82f86e937bb219f1.tar.gz micropython-93451002f04e0b89e41e1faa82f86e937bb219f1.zip | |
Merge remote-tracking branch 'upstream/master' into builtins
Conflicts:
py/builtin.c
py/builtin.h
py/runtime.c
Diffstat (limited to 'py/mpconfig.h')
| -rw-r--r-- | py/mpconfig.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/mpconfig.h b/py/mpconfig.h index ada4aa2ea4..5d8c57692e 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -91,7 +91,7 @@ typedef long long mp_longint_impl_t; #define BITS_PER_BYTE (8) #define BITS_PER_WORD (BITS_PER_BYTE * BYTES_PER_WORD) // machine_int_t value with most significant bit set -#define WORD_MSBIT_HIGH (1 << (BYTES_PER_WORD * 8 - 1)) +#define WORD_MSBIT_HIGH (((machine_uint_t)1) << (BYTES_PER_WORD * 8 - 1)) // printf format spec to use for machine_int_t and friends #ifndef INT_FMT |