diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2018-08-16 00:27:01 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2018-08-16 17:40:57 -0700 |
| commit | 137a30ad75803255615a422c15ebcd35fbd31130 (patch) | |
| tree | dfad063c41465ad87979d0156fae20936152a0b4 | |
| parent | de5a9d72dcdaacdd5048195cd5bab007f4b2baef (diff) | |
fix mpy-cross
| -rw-r--r-- | py/makeqstrdata.py | 6 | ||||
| -rw-r--r-- | supervisor/shared/translate.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py index ea8629ef3..b0a043ee3 100644 --- a/py/makeqstrdata.py +++ b/py/makeqstrdata.py @@ -11,8 +11,12 @@ import sys import collections import gettext +import os.path -sys.path.append("../../tools/huffman") +py = os.path.dirname(sys.argv[0]) +top = os.path.dirname(py) + +sys.path.append(os.path.join(top, "tools/huffman")) import huffman diff --git a/supervisor/shared/translate.c b/supervisor/shared/translate.c index 1f338befc..487ae1997 100644 --- a/supervisor/shared/translate.c +++ b/supervisor/shared/translate.c @@ -71,8 +71,6 @@ char* decompress(const compressed_string_t* compressed, char* decompressed) { return decompressed; } -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wreturn-local-addr" inline __attribute__((always_inline)) const compressed_string_t* translate(const char* original) { #ifndef NO_QSTR #define QDEF(id, str) @@ -83,4 +81,3 @@ inline __attribute__((always_inline)) const compressed_string_t* translate(const #endif return NULL; } -#pragma GCC diagnostic pop |