diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-12 20:48:00 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-12 20:48:00 -0500 |
| commit | 1d2cb1a2d81af4a760aac18521e11e268ad3711b (patch) | |
| tree | 09d625e22cc1daa5aa4d53fc1553627aa61eb72e /qjson.h | |
| parent | 8d9dde9429d2b5b513bf92d94a257a00ea2da1bf (diff) | |
| parent | d03ee40185ae8f6d6993ef58f96e0eb956f3cc33 (diff) | |
| download | focaccia-qemu-1d2cb1a2d81af4a760aac18521e11e268ad3711b.tar.gz focaccia-qemu-1d2cb1a2d81af4a760aac18521e11e268ad3711b.zip | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp: qapi-schema.json: fix comment for type ObjectPropretyInfo qapi-schema: fix typos and explain 'spice' auth qjson.h: include compiler.h for GCC_FMT_ATTR
Diffstat (limited to 'qjson.h')
| -rw-r--r-- | qjson.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qjson.h b/qjson.h index 65b10ea369..1190d8a86c 100644 --- a/qjson.h +++ b/qjson.h @@ -15,6 +15,7 @@ #define QJSON_H #include <stdarg.h> +#include "compiler.h" #include "qobject.h" #include "qstring.h" |