diff options
| author | Eric Blake <eblake@redhat.com> | 2016-02-02 07:51:41 -0700 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-02-08 17:29:57 +0100 |
| commit | 86ae191163d48ff4ff9d9996868e6cfe92a82449 (patch) | |
| tree | ca8b02e73db0fbc2f2a0629f4b25b51c42c27f3d /scripts | |
| parent | 455ba08afde784466420449d01c6458f88349d55 (diff) | |
| download | qemu-86ae191163d48ff4ff9d9996868e6cfe92a82449.tar.gz qemu-86ae191163d48ff4ff9d9996868e6cfe92a82449.tar.bz2 qemu-86ae191163d48ff4ff9d9996868e6cfe92a82449.zip | |
qapi: Fix compilation failure on MIPS and SPARC
Commit 86f4b687 broke compilation on MIPS and SPARC, which have a
preprocessor pollution of '#define mips 1' and '#define sparc 1',
respectively. Treat it the same way as we do for the pollution with
'unix', so that QMP remains backwards compatible and only the C code
needs to use the alternative 'q_mips', 'q_sparc' spelling.
CC: James Hogan <james.hogan@imgtec.com>
CC: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Eric Blake <eblake@redhat.com>
Tested-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qapi.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py index 7519cf8e7a..f40dc9e777 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1482,7 +1482,7 @@ def c_name(name, protect=True): 'and', 'and_eq', 'bitand', 'bitor', 'compl', 'not', 'not_eq', 'or', 'or_eq', 'xor', 'xor_eq']) # namespace pollution: - polluted_words = set(['unix', 'errno']) + polluted_words = set(['unix', 'errno', 'mips', 'sparc']) name = name.translate(c_name_trans) if protect and (name in c89_words | c99_words | c11_words | gcc_words | cpp_words | polluted_words): |