diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2011-06-13 23:01:53 +0200 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2011-06-16 11:42:40 -0300 |
| commit | e4ea5e2d0e0e4c5188ab45b66f3195062ae059dc (patch) | |
| tree | cd916cee9235cc8893697ea50a6df2d79cc5a0ce | |
| parent | eb47d7c5d96060040931c42773ee07e61e547af9 (diff) | |
error framework: Fix compilation for w32/w64
The declaration of function error_set() should use macro GCC_FMT_ATTR
instead of gcc's format printf attribute.
For w32/w64, both declarations are different and GCC_FMT_ATTR is needed.
Compilation for w64 even failed with the original code because mingw64
defines a macro for printf.
GCC_FMT_ATTR requires qemu-common.h, so add it in error.c
(it's also included by error_int.h but too late).
Remove assert.h which is included by qemu-common.h.
Cc: Luiz Capitulino <lcapitulino@redhat.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| -rw-r--r-- | error.c | 3 | ||||
| -rw-r--r-- | error.h | 3 |
2 files changed, 3 insertions, 3 deletions
@@ -9,11 +9,12 @@ * This work is licensed under the terms of the GNU LGPL, version 2. See * the COPYING.LIB file in the top-level directory. */ + +#include "qemu-common.h" #include "error.h" #include "error_int.h" #include "qemu-objects.h" #include "qerror.h" -#include <assert.h> struct Error { @@ -25,8 +25,7 @@ typedef struct Error Error; * Currently, qerror.h defines these error formats. This function is not * meant to be used outside of QEMU. */ -void error_set(Error **err, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); +void error_set(Error **err, const char *fmt, ...) GCC_FMT_ATTR(2, 3); /** * Returns true if an indirect pointer to an error is pointing to a valid |