Merge commit 'afbaa7b4382faced3c364606a5e5d5389462147b' into upstream-merge

* commit 'afbaa7b4382faced3c364606a5e5d5389462147b': (24 commits)
  virtio-net: unify vhost-net start/stop
  virtio: invoke set_status callback on reset
  net: delay freeing peer host device
  console: Avoid dereferencing NULL active_console
  exec: Fix compilation error for debug code
  rc4030: Fix compilation error in debug code
  mipsnet: Fix compiler warning in debug code
  block/vvfat: Fix compiler warning in debug code
  virtio-9p: Use GCC_FMT_ATTR and fix a format warning
  blockdev: Use GCC_FMT_ATTR (format checking)
  Use GCC_FMT_ATTR (format checking)
  Replace most gcc format attributes by macro GCC_FMT_ATTR (format checking)
  slirp: Silence warning on Haiku
  tap: Add stub for Haiku
  nbd: Haiku has _IO() in its BSD compatibility layer
  Haiku doesn't have libm
  configure: Don't rely on special pthreads library
  configure: Add basic support for Haiku
  trace: avoid unnecessary recompilation if nothing changed
  Makefile: fix config-devices.mak generation
  ...

Conflicts:
	hw/virtio-net.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/qjson.h b/qjson.h
index cd60e0bbe..65b10ea36 100644
--- a/qjson.h
+++ b/qjson.h
@@ -18,10 +18,9 @@
 #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);