aboutsummaryrefslogtreecommitdiff
path: root/error.c
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2011-06-13 23:01:53 +0200
committerLuiz Capitulino <lcapitulino@redhat.com>2011-06-16 11:42:40 -0300
commite4ea5e2d0e0e4c5188ab45b66f3195062ae059dc (patch)
treecd916cee9235cc8893697ea50a6df2d79cc5a0ce /error.c
parenteb47d7c5d96060040931c42773ee07e61e547af9 (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>
Diffstat (limited to 'error.c')
-rw-r--r--error.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/error.c b/error.c
index 867eec2c1a..74d7398b58 100644
--- a/error.c
+++ b/error.c
@@ -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
{