From: Luiz Capitulino <lcapitulino@redhat.com>
Date: Fri, 27 Jul 2012 13:56:33 +0000 (-0300)
Subject: qapi: qapi-types.h: don't include qapi/qapi-types-core.h
X-Git-Tag: qemu-xen-4.3.0-rc1~745^2~29
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b68a8472c17d2d2127afcf1a8dc57884e6584173;p=qemu-xen.git

qapi: qapi-types.h: don't include qapi/qapi-types-core.h

qapi-types.h needs only qemu-common.h. Including qapi-types-core.h
causes problems when qerror.h or error.h includes qapi-types.h.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---

diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 4a734f58d5..3ed9f04895 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -253,7 +253,8 @@ fdecl.write(mcgen('''
 #ifndef %(guard)s
 #define %(guard)s
 
-#include "qapi/qapi-types-core.h"
+#include "qemu-common.h"
+
 ''',
                   guard=guardname(h_file)))