diff options
| author | Josh Lloyd <j.nevercast@gmail.com> | 2019-09-25 17:53:30 +1200 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2019-09-26 16:04:56 +1000 |
| commit | 7d58a197cffa7c0dd3686402d2e381812bb8ddeb (patch) | |
| tree | 5cdf657c988c65f7ada0a5b489220d51849b189f /py/qstr.h | |
| parent | b596638b9b28975adee4a06a92497b5d9dbba34c (diff) | |
py: Rename MP_QSTR_NULL to MP_QSTRnull to avoid intern collisions.
Fixes #5140.
Diffstat (limited to 'py/qstr.h')
| -rw-r--r-- | py/qstr.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -35,7 +35,7 @@ // Note: it would be possible to define MP_QSTR_xxx as qstr_from_str_static("xxx") // for qstrs that are referenced this way, but you don't want to have them in ROM. -// first entry in enum will be MP_QSTR_NULL=0, which indicates invalid/no qstr +// first entry in enum will be MP_QSTRnull=0, which indicates invalid/no qstr enum { #ifndef NO_QSTR #define QDEF(id, str) id, @@ -61,7 +61,7 @@ typedef struct _qstr_pool_t { void qstr_init(void); mp_uint_t qstr_compute_hash(const byte *data, size_t len); -qstr qstr_find_strn(const char *str, size_t str_len); // returns MP_QSTR_NULL if not found +qstr qstr_find_strn(const char *str, size_t str_len); // returns MP_QSTRnull if not found qstr qstr_from_str(const char *str); qstr qstr_from_strn(const char *str, size_t len); |
