From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 5 Oct 2010 18:54:49 +0000 (-0500)
Subject: Merge remote branch 'qmp/for-anthony' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=48f57044e6a826329ebcac5d5a76d776a14e5d43;p=qemu.git

Merge remote branch 'qmp/for-anthony' into staging
---

48f57044e6a826329ebcac5d5a76d776a14e5d43
diff --cc qjson.h
index 70d0afba54,cd60e0bbe5..65b10ea369
--- a/qjson.h
+++ b/qjson.h
@@@ -18,10 -18,12 +18,11 @@@
  #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 */