aboutsummaryrefslogtreecommitdiffstats
path: root/qjson.h
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2010-09-23 21:28:03 +0200
committerBlue Swirl <blauwirbel@gmail.com>2010-10-03 06:34:36 +0000
commite5924d8980e0bd027f2f12fa702ec1c555538230 (patch)
tree74d22ef9b1e233ae742b9e5873da6202c9ea3b30 /qjson.h
parent4a2b39d3232fea40d3e396a683f27f5e378ae46e (diff)
Replace most gcc format attributes by macro GCC_FMT_ATTR (format checking)
Since version 4.4.x, gcc supports additional format attributes. __attribute__ ((format (gnu_printf, 1, 2))) should be used instead of __attribute__ ((format (printf, 1, 2)) because QEMU always uses standard format strings (even with mingw32). The patch replaces format attribute printf / __printf__ by macro GCC_FMT_ATTR which uses gnu_printf if supported. It also removes an #ifdef __GNUC__ (not needed any longer). Cc: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'qjson.h')
-rw-r--r--qjson.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/qjson.h b/qjson.h
index 7afec2eec..7eef35735 100644
--- a/qjson.h
+++ b/qjson.h
@@ -19,8 +19,7 @@
#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_jsonf(const char *string, ...) GCC_FMT_ATTR(1, 2);
QObject *qobject_from_jsonv(const char *string, va_list *ap);
QString *qobject_to_json(const QObject *obj);