diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-05 16:37:26 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-05 16:37:26 +0000 |
| commit | 31db5b3638553e616eba3391dbff88f77b8a5bc9 (patch) | |
| tree | 4583f3eb73f65d904d1eecc43d5f1729fdcc1fa4 /include/qemu/readline.h | |
| parent | e5d3df6deb664a31e6c69b36e07f1701fee7cbf5 (diff) | |
| parent | b76afd1072e02fe77e09790fbe1e831700976c5f (diff) | |
| download | qemu-31db5b3638553e616eba3391dbff88f77b8a5bc9.zip qemu-31db5b3638553e616eba3391dbff88f77b8a5bc9.tar.gz qemu-31db5b3638553e616eba3391dbff88f77b8a5bc9.tar.bz2 | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-02-02' into staging
trivial patches for 2014-02-02
# gpg: Signature made Sun 02 Feb 2014 16:11:37 GMT using RSA key ID 74F0C838
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: E190 8639 3B10 B51B AC2C 8B73 5253 C5AD 74F0 C838
* remotes/mjt/tags/trivial-patches-2014-02-02:
tests/.gitignore: Ignore tests/check-qom-interface
hw/ppc: Remove unused defines
readline: Add missing GCC_FMT_ATTR
tcg/s390: Remove sigill_handler
i386: Add missing include file for QEMU_PACKED
osdep: drop unused #include "trace.h"
qemu 1.7.0 does not build on NetBSD
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/readline.h')
| -rw-r--r-- | include/qemu/readline.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/qemu/readline.h b/include/qemu/readline.h index a89fe4a..49efe4e 100644 --- a/include/qemu/readline.h +++ b/include/qemu/readline.h @@ -5,7 +5,8 @@ #define READLINE_MAX_CMDS 64 #define READLINE_MAX_COMPLETIONS 256 -typedef void ReadLinePrintfFunc(void *opaque, const char *fmt, ...); +typedef void GCC_FMT_ATTR(2, 3) ReadLinePrintfFunc(void *opaque, + const char *fmt, ...); typedef void ReadLineFlushFunc(void *opaque); typedef void ReadLineFunc(void *opaque, const char *str, void *readline_opaque); |