diff options
author | Damien George <damien.p.george@gmail.com> | 2014-07-03 13:25:24 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-07-03 13:25:24 +0100 |
commit | 40f3c026823f8951a2fa04e9c7fc93c75bc27bec (patch) | |
tree | c9c8210654c7114f00c5234a8481d9b5fbd28ce0 /py/objstr.h | |
parent | 065aba587571150074ea79483ffa72c0fe6bc8c8 (diff) |
Rename machine_(u)int_t to mp_(u)int_t.
See discussion in issue #50.
Diffstat (limited to 'py/objstr.h')
-rw-r--r-- | py/objstr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/py/objstr.h b/py/objstr.h index 515890c6e..6818b4603 100644 --- a/py/objstr.h +++ b/py/objstr.h @@ -27,9 +27,9 @@ typedef struct _mp_obj_str_t { mp_obj_base_t base; // XXX here we assume the hash size is 16 bits (it is at the moment; see qstr.c) - machine_uint_t hash : 16; + mp_uint_t hash : 16; // len == number of bytes used in data, alloc = len + 1 because (at the moment) we also append a null byte - machine_uint_t len : 16; + mp_uint_t len : 16; const byte *data; } mp_obj_str_t; @@ -55,7 +55,7 @@ mp_obj_t mp_obj_str_format(uint n_args, const mp_obj_t *args); mp_obj_t mp_obj_new_str_of_type(const mp_obj_type_t *type, const byte* data, uint len); mp_obj_t mp_obj_str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in); -machine_int_t mp_obj_str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, int flags); +mp_int_t mp_obj_str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, int flags); const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, uint self_len, mp_obj_t index, bool is_slice); |