Merge branch 'vga.1' of git://git.kraxel.org/qemu

[qemu.git] / qjson.h

diff --git a/qjson.h b/qjson.h
index 7afec2eec1296cabd59e8b5862d6cf2c46823970..1190d8a86c2b2edeb787375ffd13aadf66e7a55c 100644 (file)
--- a/qjson.h
+++ b/qjson.h
@@ -15,14 +15,15 @@
 #define QJSON_H
 
 #include <stdarg.h>
+#include "compiler.h"
 #include "qobject.h"
 #include "qstring.h"
 
-QObject *qobject_from_json(const char *string);
-QObject *qobject_from_jsonf(const char *string, ...)
-    __attribute__((__format__ (__printf__, 1, 2)));
-QObject *qobject_from_jsonv(const char *string, va_list *ap);
+QObject *qobject_from_json(const char *string) GCC_FMT_ATTR(1, 0);
+QObject *qobject_from_jsonf(const char *string, ...) GCC_FMT_ATTR(1, 2);
+QObject *qobject_from_jsonv(const char *string, va_list *ap) GCC_FMT_ATTR(1, 0);
 
 QString *qobject_to_json(const QObject *obj);
+QString *qobject_to_json_pretty(const QObject *obj);
 
 #endif /* QJSON_H */